OSDN Git Service

Merge commit 'origin/1.3'
authormae <qt-info@nokia.com>
Tue, 1 Dec 2009 14:58:09 +0000 (15:58 +0100)
committermae <qt-info@nokia.com>
Tue, 1 Dec 2009 14:58:09 +0000 (15:58 +0100)
commit0fffad22ad3220387c9a33d1b45a7afe0f3d1175
tree9c822a890f973031d0c1287c40f8c68618fd13f1
parent8a050af51caec1af373add3a4b4955ccd713481d
parent7fa8574d98bec3f0e9250bc9487f9b8f9ef1f792
Merge commit 'origin/1.3'
src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor_p.h