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:
05639e4
e5b9c76
)
Merge remote branch 'origin/2.0'
author
Erik Verbruggen
<erik.verbruggen@nokia.com>
Tue, 15 Jun 2010 09:33:45 +0000
(11:33 +0200)
committer
Erik Verbruggen
<erik.verbruggen@nokia.com>
Tue, 15 Jun 2010 09:33:45 +0000
(11:33 +0200)
Conflicts:
src/plugins/qmljseditor/qmljshighlighter.cpp
src/plugins/qmljseditor/qmljshighlighter.h
src/plugins/texteditor/basetextdocumentlayout.cpp
src/plugins/texteditor/basetextdocumentlayout.h
Trivial merge
OSDN Git Service
