summaryrefslogtreecommitdiffstats
path: root/src/plugins/qnx
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-07 15:15:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-07 15:15:15 +0100
commitb0481d4b47f96b157989203bf57ec7e8ca266513 (patch)
tree79c4e627a1973350af18be8a0a5fac44b456e30f /src/plugins/qnx
parent4050cdf66d06c5492f3459f8cd4defa1bf434f7e (diff)
parente236de90c27acf7ef3b2d301f2f5cab958d791ef (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/qnx')
0 files changed, 0 insertions, 0 deletions