Skip to content

Commit

Permalink
Merge branch 'upstream/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	de_DE/ts/kxshare.ts
  • Loading branch information
@forelabs
forelabs committed Aug 18, 2014
2 parents a80a2b5 + b006bfc commit 5449f3b
Show file tree
Hide file tree
Showing 5,400 changed files with 895,252 additions and 412,891 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 0 additions & 7 deletions CMakeLists.txt
View file

This file was deleted.

Loading

0 comments on commit 5449f3b

Please sign in to comment.