Liang Qi a359bd756a Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/doc/src/qt3dcollision-module.qdoc src/render/frontend/qcamera.cpp src/render/frontend/qcameralens.cpp Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d		2016-01-26 21:50:16 +01:00
..
qgltf	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 21:50:16 +01:00
utils/qtcreator	Fix typo in creator template and adjust whitespace	2016-01-17 17:20:23 +00:00
tools.pro	Rename tools directory back	2015-08-18 11:30:30 +00:00