Friedemann Kleint 29e0f0d46b Merge remote branch 'origin/2.1' ...

Conflicts:
	src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp

2010-09-29 09:28:52 +02:00

..

designer

Fixes: Implement make install target, Step 1

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

gdbmacros

debugger: python dumpers for QTextCursor and QTextDocument

2010-09-28 09:37:56 +02:00

generic-highlighter

Generic highlighter: Add Creator's default folder for definitions.

2010-09-23 17:08:32 +02:00

patches

Git attributes to force patches to always be LF

2010-04-20 08:08:31 +02:00

qml-type-descriptions

Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline

2010-08-23 16:00:24 +02:00

qmldesigner/propertyeditor/Qt

QmlDesigner.propertyEditor: remove useless binding

2010-09-20 14:09:10 +02:00

qmlicons

QmlOutline: Additional icons

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

qmljsdebugger

Revert "Compile"

2010-09-29 16:42:00 +10:00

rss

Add a dummy RSS file, to be filled with (local) content later

2010-09-24 17:40:22 +02:00

schemes

Change the shortcut for ui form preview

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

snippets

Remove old and unused snippets file.

2010-09-28 14:45:44 +02:00

styles

Updated Grayscale and Vim (dark) color schemes

2010-09-10 09:46:12 +02:00

templates

Merge remote branch 'origin/2.1'

2010-09-29 09:28:52 +02:00

translations

L10n: Improved German translations related to checkboxes

2010-09-28 20:52:36 +02:00

runInTerminal.command

make terminal emulator configurable centrally

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

static.pro

Add a dummy RSS file, to be filled with (local) content later

2010-09-24 17:40:22 +02:00