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_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configure.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +01:00
configureapp.h	Updated license headers	2016-01-21 18:55:18 +00:00
environment.cpp	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
environment.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
Makefile.mingw	Mingw: Build configure.exe with C++11 support	2015-11-16 19:07:51 +00:00
Makefile.win32	Remove support for MSVC earlier than 2012	2015-10-27 23:26:52 +00:00
tools.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tools.h	Updated license headers	2016-01-21 18:55:18 +00:00