OSDN Git Service
(root)
/
qt-creator-jp
/
qt-creator-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a1fe81
7f5dbc8
)
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
author
mae
<qt-info@nokia.com>
Mon, 4 May 2009 11:47:39 +0000
(13:47 +0200)
committer
mae
<qt-info@nokia.com>
Mon, 4 May 2009 11:47:39 +0000
(13:47 +0200)
1
2
src/plugins/texteditor/basetexteditor.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/plugins/texteditor/basetexteditor.cpp
Simple merge