summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix/unixmake.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-05-08 15:29:43 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-05-08 17:34:00 +0000
commit9b2ee419b4218126e00096ef5034e846ff3b9db1 (patch)
treecd11989ad66ead8e506e83dea6359e3be972034e /qmake/generators/unix/unixmake.cpp
parent4fe68ffbe5c93244562f2b56292d4ecf5ce39f56 (diff)
parent1fce111809f216383e60f56b57a9f68ccd2b766f (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into merge5.5" into refs/staging/5.5
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
0 files changed, 0 insertions, 0 deletions