diff options
| author | con <qtc-committer@nokia.com> | 2010-07-13 11:31:05 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-13 11:31:05 +0200 |
| commit | d24d01f49c92cc45f7473ded912a5fef2e068e99 (patch) | |
| tree | 4d88e73d69926dd9d3e87af038dc396b39170ed9 /.gitignore | |
| parent | f823c4810e3f544df2440db0c0e1966b6f197f4b (diff) | |
| parent | 52b9fcca2ddd5d5e95c6e13cbded018699c7dd68 (diff) | |
| download | qt-creator-d24d01f49c92cc45f7473ded912a5fef2e068e99.tar.gz | |
Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)
Conflicts:
src/plugins/debugger/debuggeragents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index c5566d40fa..38c2d41a53 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,7 @@ doc/pluginhowto/html/* # Binaries # -------- bin/*.dll -bin/qtcreator.bin +bin/qtcreator bin/qtcreator_process_stub* bin/qtcreator.exe share/doc/qtcreator/qtcreator.qch |