summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-03 15:19:26 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-03 15:19:38 +0200
commite72e60b1072e0bdefc0b899a5aad505fc3a8b3df (patch)
treeb11b306c7683fa7d31a1d7503e13ef7d2a5bce32 /qmake/generators/makefile.cpp
parent0f92f2f35d55f2de545e8472c6b240c8fd0bb53f (diff)
parenta2b221e595de812f28b4e25ce8014df62407f899 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'qmake/generators/makefile.cpp')
0 files changed, 0 insertions, 0 deletions