Eike Ziller 767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb

2015-02-25 10:15:28 +01:00

42 KiB

Raw Blame History

View Raw