OSDN Git Service

(root) / qt-creator-jp / qt-creator-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac28279 6adc5b1)
Merge remote branch 'origin/2.1' into 2.2
authorcon <qtc-committer@nokia.com>
Fri, 11 Mar 2011 08:25:57 +0000 (09:25 +0100)
committercon <qtc-committer@nokia.com>
Fri, 11 Mar 2011 08:25:57 +0000 (09:25 +0100)
Conflicts:
doc/qtcreator.qdoc

1  2 
doc/qtcreator.qdoc patch | diff1 | diff2 | blob | history

diff --cc doc/qtcreator.qdoc
Simple merge
Qt Creator 日本語化プロジェクトのgitリポジトリです。
About OSDN
Find Software
Develop Software
Help