Simon Hausmann 508b95899d Merge remote-tracking branch 'origin/stable' into dev ... Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc		2014-05-22 07:46:17 +02:00
..
configure	Merge remote-tracking branch 'origin/stable' into dev	2014-05-22 07:46:17 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00