Oswald Buddenhagen dbcaadd8af Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76

2012-03-22 15:09:50 +01:00

..

boost

Long live the king!

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

gui

Long live the king!

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

helper

Long live the king!

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

python

debugger: rename manual tests from 'gdbdebugger' to 'debugger'

2011-08-24 13:54:34 +02:00

qquick1

Removed module names from #include directives.

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

qquick2

Removed module names from #include directives.

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

script

Long live the king!

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

simple

Merge remote-tracking branch 'origin/2.5'

2012-03-22 15:09:50 +01:00

spacy path

Removed module names from #include directives.

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

spacy-file

Removed module names from #include directives.

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

debugger.pro

Tests: Make compile.

2011-10-20 16:43:37 +02:00