summaryrefslogtreecommitdiffstats
path: root/src/platformheaders
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-25 12:22:50 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-25 12:23:22 +0100
commit709e40093e6081b18e0d3003e0a088e1a9b6f211 (patch)
tree0f7c729c13b5a17f11ce176906f62ef43ea895a2 /src/platformheaders
parent62cd369594dc39e06e8c7ec2c761cfedf5d9c9ba (diff)
parent34b14a8472f44f8517577756e033b92ebd4c5912 (diff)
Merge remote-tracking branch 'origin/5.5' into dev
Diffstat (limited to 'src/platformheaders')
0 files changed, 0 insertions, 0 deletions