diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-21 18:07:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-21 18:07:07 +0100 |
| commit | 745f8d5329d0d6d98a8577a254d2ee3e7174634e (patch) | |
| tree | 004dc65891bf0e68329658d1ae98494437f7b253 /.gitignore | |
| parent | 510ee7f04035dc64d43be29716d6d8079a8d908a (diff) | |
| parent | cbef985e3c3e9af2d124d40959fc674b3b8aa33f (diff) | |
| download | qttranslations-745f8d5329d0d6d98a8577a254d2ee3e7174634e.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I425892e7d4d9fa73f6dc23be4f4aa4cbf8d0cc95
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -115,6 +115,7 @@ tests/auto/qresourceengine/runtime_resource.rcc tools/activeqt/testcon/testcon.tlb translations/*.qm translations/*_untranslated.ts +translations/*_en.ts qrc_*.cpp # Test generated files |