Merged upstream changes

This commit is contained in:
Xian Nox
2013-12-14 08:32:41 +01:00
8 changed files with 69 additions and 25 deletions

3
.gitignore vendored
View File

@@ -1,3 +1,2 @@
qcma.pro.user*
*.qm
.directory
*.qm