Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 12 Aug 2014 10:34:35 +0000 (12:34 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 12 Aug 2014 12:43:59 +0000 (14:43 +0200)
commit0af61d773fc7263573afc6b7a973451783bf7424
tree327563220f4fe53649b7fc98f982b659b462a9dc
parent4ad1b63f257ac033e3876130f39eba3325363de5
parent61f72d32b4fddc6e87f21d0243d9f0a32ca61987
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4