Liang Qi e5ac4afbf9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/uikit/default_post.prf Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218		2016-11-17 14:43:26 +01:00
..
configure	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-17 14:43:26 +01:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00