diff options
| author | con <qtc-committer@nokia.com> | 2010-07-26 12:26:05 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-26 12:26:05 +0200 |
| commit | 39a8e977759f3810ff367e2d8390d913791af3e3 (patch) | |
| tree | 12d7f7c446d9c3c1de0d605684ef05d3ae0b1667 /.gitignore | |
| parent | 91b6d329fe74143c75ccd53b1e6a2a129c113a7a (diff) | |
| parent | 1a985148340ff3b29c752036857446452cf0907f (diff) | |
| download | qt-creator-39a8e977759f3810ff367e2d8390d913791af3e3.tar.gz | |
Merge commit origin/2.0 '1a985148340ff3b29c752036857446452cf0907f'
Conflicts:
src/plugins/qmldesigner/settingspage.ui
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 508f0b516e..15bb1bc52e 100644 --- a/.gitignore +++ b/.gitignore @@ -53,8 +53,8 @@ Thumbs.db *.Release # translation related: -share/qtcreator/translations/extract-mimetypes.xq -share/qtcreator/translations/extract-customwizards.xq +share/qtcreator/translations/*_tr.h +share/qtcreator/translations/qtcreator_untranslated.ts # Directories to ignore # --------------------- |