summaryrefslogtreecommitdiffstats
path: root/qtqa
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-23 12:24:59 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-23 12:24:59 +0200
commit433e143b231a7cc7f1b37ce85d5ee6c3e06efab0 (patch)
tree6e89a975e9d569b69239059c7a0d0efe0fcb2687 /qtqa
parente39f4e8b4be5da3d549c740ba396576bff7f952d (diff)
parentacd97fec50d85bc9c82ea5ab49072acf992a0d0b (diff)
Merge branch 'dev' into stable
Conflicts: qtjsbackend
Diffstat (limited to 'qtqa')
0 files changed, 0 insertions, 0 deletions