OSDN Git Service

Merge branch '1.3'
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Thu, 4 Feb 2010 14:09:05 +0000 (15:09 +0100)
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Thu, 4 Feb 2010 14:09:05 +0000 (15:09 +0100)
commit9b3dd396befb968b0b4cdd5c85ef638fdef53924
tree365023af4257dea734a9fb84cdc9bff8b9c6781d
parent2ce1603ccfc4f0facb6a363cc9522b392ae7c060
parent5268aaed0d077c7ab3d4f718364af24fed88b80f
Merge branch '1.3'

Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
doc/qtcreator.qdoc
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/texteditor/basetexteditor.cpp