git.sourceforge.jp Git - qt-creator-jp/qt-creator-jp.git/commit

(root) / qt-creator-jp / qt-creator-jp.git / commit

author	con <qtc-committer@nokia.com>
	Wed, 30 Jun 2010 12:25:09 +0000 (14:25 +0200)
committer	con <qtc-committer@nokia.com>
	Wed, 30 Jun 2010 12:25:09 +0000 (14:25 +0200)
commit	ede2a7c97599886aa0ce7d36502b8d7966d78a77
tree	194495903d59c542d5db00c8bcc18710fdc7b3eb	tree \| snapshot
parent	82cc4b430209bbdfccc4acecc4253327870fb161	commit \| diff
parent	21b211fed0ae36de57dbfb9ca60239dd259b9a60	commit \| diff

Merge remote branch 'origin/2.0'

Conflicts:
doc/qtcreator.qdoc
share/qtcreator/gdbmacros/dumper.py
src/libs/qmljs/qmljs-lib.pri
src/plugins/debugger/breakhandler.cpp
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h

20 files changed:

doc/qtcreator.qdoc	diff1 \|	diff2 \|	blob \| history
share/qtcreator/gdbmacros/dumper.py	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljs-lib.pri	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljsinterpreter.cpp	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljsinterpreter.h	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljslink.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/filemanager.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/mainwindow.h	diff1 \|	diff2 \|	blob \| history
src/plugins/cppeditor/cpphoverhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/debugger/breakhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/debugger/gdb/trkgdbadapter.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/designer/formeditorw.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/designer/formeditorw.h	diff1 \|	diff2 \|	blob \| history
src/plugins/git/gitclient.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/projectexplorer/projectexplorer.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/projectexplorer/projectexplorer.h	diff1 \|	diff2 \|	blob \| history
src/plugins/qmljseditor/qmljscodecompletion.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h	diff1 \|	diff2 \|	blob \| history

Qt Creator 日本語化プロジェクトのgitリポジトリです。

RSS Atom

About OSDN

Find Software

Develop Software

Help

doc/qtcreator.qdoc	diff1 \|	diff2 \|	blob \| history
share/qtcreator/gdbmacros/dumper.py	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljs-lib.pri	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljsinterpreter.cpp	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljsinterpreter.h	diff1 \|	diff2 \|	blob \| history
src/libs/qmljs/qmljslink.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/filemanager.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/coreplugin/mainwindow.h	diff1 \|	diff2 \|	blob \| history
src/plugins/cppeditor/cpphoverhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/debugger/breakhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/debugger/gdb/trkgdbadapter.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/designer/formeditorw.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/designer/formeditorw.h	diff1 \|	diff2 \|	blob \| history
src/plugins/git/gitclient.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/projectexplorer/projectexplorer.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/projectexplorer/projectexplorer.h	diff1 \|	diff2 \|	blob \| history
src/plugins/qmljseditor/qmljscodecompletion.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h	diff1 \|	diff2 \|	blob \| history