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
..
qmake.conf	Merge remote-tracking branch 'origin/stable' into dev	2013-12-05 18:52:38 +01:00
qplatformdefs.h	WinRT: Introduced qfunctions_winrt	2013-09-26 17:26:58 +02:00