Eike Ziller 44931c0985 Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0

2013-04-18 09:22:19 +02:00

..

instances

Merge remote-tracking branch 'origin/2.7'

2013-04-18 09:22:19 +02:00

Info.plist.in

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

main.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qml2puppet.pri

Fix compilation for Mac OS X

2013-04-17 11:23:33 +02:00

qml2puppet.pro

QmlDesigner: fixing .pro file for mac

2013-03-06 15:41:04 +01:00