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:
ef1e52d
c827962
)
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
author
Kai Koehne
<kai.koehne@nokia.com>
Mon, 23 Aug 2010 14:31:43 +0000
(16:31 +0200)
committer
Kai Koehne
<kai.koehne@nokia.com>
Mon, 23 Aug 2010 14:31:43 +0000
(16:31 +0200)
Merge latest changes of master into merge :)
Conflicts:
doc/qtcreator.qdoc
1
2
doc/qtcreator.qdoc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/qtcreator.qdoc
Simple merge