Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01
This commit is contained in:
Oswald Buddenhagen
2015-03-20 13:07:29 +01:00
8 changed files with 54 additions and 76 deletions

1
.gitmodules vendored
View File

@@ -108,6 +108,7 @@
path = qt3d
url = ../qt3d.git
branch = dev
initrepo = true
[submodule "qtimageformats"]
path = qtimageformats
url = ../qtimageformats.git