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
..
qmake.conf	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
qplatformdefs.h	Android: Initial support for arm64-v8a, x86_64, mips64 architectures.	2014-11-18 17:17:18 +01:00