Files
qt-creator/src/plugins/git/gitcommand.cpp
con 6503099bec Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp
2010-07-05 13:54:07 +02:00

7.8 KiB