summaryrefslogtreecommitdiffstats
path: root/qtbase.pro
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-02 04:20:54 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-06-02 04:20:54 +0000
commit7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (patch)
tree0bf906e3585c93cbe5ef67a05b4a129e18e3edbd /qtbase.pro
parent6e008cd57955c8029671c4c92250b86767f8ec1f (diff)
parentfcfd31c9fdd84b234cb9e42b97be62ec18389b61 (diff)
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5.0
Diffstat (limited to 'qtbase.pro')
0 files changed, 0 insertions, 0 deletions