Eike Ziller 0a0de08efb Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/plugins/find/treeviewfind.cpp

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe

2012-05-10 08:14:36 +02:00

..

bytearrayinputstream.cpp

Long live the king!

2012-01-26 19:55:36 +01:00

bytearrayinputstream.h

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

cdb.pri

clean up DEPENDPATH insanity

2011-03-09 22:24:13 +01:00

cdbengine.cpp

Merge remote-tracking branch 'origin/2.5'

2012-05-10 08:14:36 +02:00

cdbengine.h

Debugging: Pass a DebuggingLanguage arg in executeDebuggerCommand()

2012-04-10 13:12:10 +02:00

cdboptions.cpp

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

cdboptions.h

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

cdboptionspage.cpp

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

cdboptionspage.h

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00

cdboptionspagewidget.ui

Debugger[CDB]: Introduce setting for breakpoint correction.

2011-09-30 10:00:02 +02:00

cdbparsehelpers.cpp

qtcassert: move actual printing to separate function and enforce style

2012-04-17 09:53:44 +02:00

cdbparsehelpers.h

Removed module names from #include directives.

2012-02-15 16:24:46 +01:00