hjk 5805788290 Merge remote branch 'origin/2.0' ...

Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp

2010-05-27 11:11:53 +02:00

..

designer

Fixes: Implement make install target, Step 1

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

gdbmacros

Merge remote branch 'origin/2.0'

2010-05-27 11:11:53 +02:00

generic-highlighter

Parsing of definitions metadata for mime type registering is now in a separate thread (QtConcurrent). Also some clean up.

2010-05-14 10:12:27 +02:00

patches

Git attributes to force patches to always be LF

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

qml-type-descriptions

QmlJS: Generalize EasingCurve name check to all enums.

2010-05-19 12:24:32 +02:00

qmldesigner

QmlDesigner.propertyEditor: I "fixed" the resize behaivour

2010-05-21 11:28:31 +02:00

schemes

Add standard shortcut for print action.

2010-04-27 16:12:51 +02:00

snippets

Removed unwanted space from QML property snippet

2010-05-18 13:01:22 +02:00

styles

rename the 'FakeVim (dark)' colorsceem to 'Vim (dark)'

2010-03-18 16:14:12 +01:00

templates

Merge remote branch 'origin/2.0'

2010-05-20 09:28:00 +02:00

translations

remove outdated qt version check

2010-05-26 19:35:21 +02:00

runInTerminal.command

make terminal emulator configurable centrally

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

static.pro

Started mechanism to scan directory, find definition files, and register mime types.

2010-05-14 10:12:22 +02:00