con 1c2da511b9 Merge remote branch 'origin/2.2' ...

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h

2011-04-01 09:53:09 +02:00

..

designer

Fixes: Implement make install target, Step 1

2009-01-21 08:52:19 +01:00

examplebrowser

Add some more examples if available (SDK case)

2010-11-22 20:49:05 +01:00

gdbmacros

debugger: add QXmlAttributes manual test

2011-03-29 14:57:41 +02:00

generic-highlighter

Add valgrind suppression syntax highlighting file.

2011-03-04 12:33:37 +01:00

glsl

It's 2011 now.

2011-01-12 09:46:24 +01:00

patches

debugger: update gdb build README

2011-02-02 11:54:42 +01:00

qml

Automatic versioning for the qml tools.

2011-03-29 17:54:52 +02:00

qml-type-descriptions

qmldump: Dump attached types and read them in Creator.

2011-02-10 17:04:22 +01:00

qmldesigner/propertyeditor

QmlDesigner.propertyEditor: bug fix for color editing

2011-03-24 16:31:47 +01:00

qmlicons

QmlOutline: Additional icons

2010-07-16 14:10:02 +02:00

rss

Modify RSS to show new (and only) featured example

2010-10-27 18:53:46 +02:00

schemes

Change the shortcut for ui form preview

2010-08-25 11:57:02 +02:00

snippets

Snippets: Rename a few QML snippets variables

2011-02-22 11:01:05 +01:00

styles

Tweaks to the Inkpot style

2010-11-12 15:36:39 +01:00

templates

Double escaping backslashes for regular expression

2011-03-30 19:23:27 +02:00

translations

Improved German translation

2011-03-22 17:20:56 +01:00

runInTerminal.command

make terminal emulator configurable centrally

2009-04-14 11:41:23 +02:00

static.pro

exclude plist.in files from the copy targets

2011-03-30 11:00:31 +02:00