Files
qt-creator/share/qtcreator/qml/qmlpuppet/instances
Eike Ziller 99ba300ae3 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
2011-08-10 16:03:57 +02:00
..
2011-07-18 13:19:59 +02:00
2011-07-14 12:15:38 +02:00
2011-07-25 13:57:13 +02:00