con 24d592d8fa Merge remote branch 'origin/1.3' ...

Conflicts:
	src/plugins/bineditor/bineditorplugin.cpp
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp

2010-01-14 18:45:35 +01:00

..

qtcreator

Merge remote branch 'origin/1.3'

2010-01-14 18:45:35 +01:00

share.pro

move the qtcdebugger tool to an appropriate place

2009-06-08 15:55:41 +02:00