Eike Ziller 9092e70884 Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d

2012-04-27 17:02:39 +02:00

3.1 KiB

Raw Blame History

View Raw