Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 11 Sep 2014 07:53:39 +0000 (09:53 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 11 Sep 2014 09:41:47 +0000 (11:41 +0200)
commit4be5278c1e871b48ab66fc0c27443798e97220b6
tree364d8ece4399c0ceffd2f7954e93807bb559e93b
parent1c6633ff127c59075a53732cb64a3aa9e7b0e1cf
parent38fe461e2cc4bf3aebcb98d25c643bfe6653120a
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4