OSDN Git Service

Merge remote branch 'origin/1.3'
authorcon <qtc-committer@nokia.com>
Thu, 14 Jan 2010 17:45:35 +0000 (18:45 +0100)
committercon <qtc-committer@nokia.com>
Thu, 14 Jan 2010 17:45:35 +0000 (18:45 +0100)
commit24d592d8fab6a8e74e77c2e7bb578f023b979066
tree87a62712417b3f9e4aabf09aaebabf5dcc98c6a3
parent00142e4cf49450723acfdfe4514afb8a3dfb8d0d
parentcd8bc8a207fce7c019facbd26bbbbb818116b821
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
src/plugins/bineditor/bineditorplugin.cpp
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/coreplugin/editormanager/openeditorswindow.cpp
src/plugins/coreplugin/mimedatabase.cpp
src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/watchhandler.cpp
src/plugins/texteditor/colorscheme.cpp
src/plugins/texteditor/fontsettings.cpp
src/plugins/texteditor/fontsettings.h
src/tools/qtcdebugger/main.cpp