Liang Qi 71ec1d6d79 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: qmake/generators/win32/mingw_make.cpp Change-Id: I2f790bc8572bd22fea01edf7ca74595b29f063eb		2019-07-30 13:47:36 +02:00
..
unixmake2.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
unixmake.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-07-30 13:47:36 +02:00
unixmake.h	Clean up class definitions of makefile generators	2019-05-16 11:36:22 +00:00