summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-11 10:15:55 +0100
committeraxis <qt-info@nokia.com>2010-03-11 10:42:47 +0100
commita375537d32bc33ba1154ec132f99f5a779bce067 (patch)
tree3c23e3b2c44fb52d7d62036fe7dd793e589841e8 /.gitignore
parent02f6da62a42bd1059eb0da091d1f46efbb919750 (diff)
parent1e9552f826c05bf9884fb2893dedca265ead363b (diff)
downloadqt4-tools-a375537d32bc33ba1154ec132f99f5a779bce067.tar.gz
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c232a0d01a..ad8e3eaab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,7 +83,7 @@ bin/kmap2qmap*
bin/qlalr*
bin/qmlconv*
bin/qmldebugger*
-bin/qmlviewer*
+bin/qml*
bin/qttracereplay*
configure.cache
config.status