Eike Ziller 81cce8902e Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac

2011-10-28 10:17:44 +02:00

..

darkvim.xml

QmlJS: Fix black-on-black text with dark color schemes.

2011-10-21 09:41:41 +02:00

default.xml

Made selecting the color scheme functional

2009-07-13 14:22:27 +02:00

grayscale.xml

Updated Grayscale and Vim (dark) color schemes

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

inkpot.xml

Merge remote-tracking branch 'origin/2.4'

2011-10-28 10:17:44 +02:00

intellij.xml

Added IntelliJ IDEA color scheme

2010-08-03 11:37:10 +02:00