qt5base-lts/tools
Liang Qi d3e6e732c7 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	config.tests/unix/compile.test
	src/plugins/platforms/cocoa/qcocoahelpers.mm
	src/tools/qlalr/cppgenerator.cpp

Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3
2016-02-02 15:57:44 +01:00
..
configure Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
shared/windows Updated license headers 2016-01-21 18:55:18 +00:00