Eike Ziller 55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD ...

Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646

2013-04-18 12:54:37 +02:00

4.2 KiB

Raw Blame History

View Raw