Frederik Gladhorn 572200989b Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5		2013-06-27 13:06:38 +02:00
..
configure	Merge remote-tracking branch 'origin/stable' into dev	2013-06-27 13:06:38 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00