con 1a2a4f6387 Merge remote branch 'origin/2.0' ...

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/fakevim/fakevimhandler.cpp

2010-07-06 15:34:50 +02:00

52 KiB

Raw Blame History

View Raw