Eike Ziller 03717cf7ef Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80

2012-12-18 17:42:04 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/2.6'

2012-12-18 17:42:04 +01:00

share.pro

Include qbs files in qmake project tree

2012-10-16 12:07:53 +02:00

share.qbs

Merge remote-tracking branch 'origin/2.6'

2012-11-27 11:50:56 +01:00