diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:35 +0200 |
commit | c4795ce81f9165a05e6f918066c671808447c539 (patch) | |
tree | 3aa7207e7a88af3c231be319dc7c219db5a1efde | |
parent | 19b6455cbde56b340ec406f7b5bfdeb1c72c656a (diff) | |
parent | 225e1740fec4559bf8d66d915ddd06b9d4f48119 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Change-Id: Ia3fd523fd27fff5b92ab41eecefc2f4b68c07ac8
-rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -6,6 +6,11 @@ Makefile* /.qmake.cache /config.status +# actually translation related +/translations/*_en.ts +/translations/*_untranslated.ts +*.qm + # general stuff tags .DS_Store |