Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
images	New Qt logo	2014-11-05 08:10:42 +01:00
scripts	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01:00
style	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00