Files
qt-creator/share
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
..