Frederik Gladhorn f6dbdd9c16 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/sql/drivers/sqlite/qsql_sqlite.cpp Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd		2013-12-05 18:52:38 +01:00
..
arch	Add x86 arch detection support for AVX512 and SHA instructions	2013-08-22 02:04:39 +02:00
common	Allow Clang to compile without libc++	2013-09-09 23:04:48 +02:00
mac/corewlan	Remove last traces of CoreServices/QT_NO_CORESERVICES on Mac	2013-10-11 18:49:25 +02:00
qpa	Move the glxfbconfig configtest to qpa and rename it to glx	2013-11-28 12:57:33 +01:00
unix	Merge remote-tracking branch 'origin/stable' into dev	2013-12-05 18:52:38 +01:00
x11	Move the glxfbconfig configtest to qpa and rename it to glx	2013-11-28 12:57:33 +01:00
.gitignore
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00