summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-28 08:56:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-28 08:58:49 +0200
commitbe35b70ca1bf61d022f7dee9df4aaccbf715b25e (patch)
treedd59ae3713b2bc516101f921491292a8b2c295e3 /lib
parentcc54161abb977751b4499c559fc0f464b9e2399e (diff)
parent572200989b224ad68e7b8ae4c0aecceb6ca871a2 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions