qt5base-lts/qmake/generators/mac
Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable
Conflicts:
	configure
	mkspecs/features/qt_module_headers.prf
	mkspecs/features/qt_tool.prf
	src/angle/angle.pro
	src/tools/bootstrap/bootstrap.pro
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
2013-03-21 08:49:01 +01:00
..
pbuilder_pbx.cpp Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
pbuilder_pbx.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00