Merge remote-tracking branch 'origin/5.6.0' into 5.6
authorLiang Qi <liang.qi@theqtcompany.com>
Thu, 31 Mar 2016 07:53:10 +0000 (09:53 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Thu, 31 Mar 2016 07:53:10 +0000 (09:53 +0200)
Conflicts:
.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580

1  2 
.gitmodules
init-repository

diff --cc .gitmodules
@@@ -27,8 -27,8 +27,8 @@@
        recommends = qttools
        path = qtscript
        url = ../qtscript.git
 -      branch = 5.6.0
 +      branch = 5.6
-       status = addon
+       status = deprecated
  [submodule "qtmultimedia"]
        depends = qtbase
        recommends = qtdeclarative
        recommends = qtdeclarative
        path = qtwayland
        url = ../qtwayland.git
 -      branch = 5.6.0
 +      branch = 5.6
-       status = preview
+       status = addon
  [submodule "qt3d"]
        depends = qtdeclarative qtimageformats
        path = qt3d
        depends = qtdeclarative
        path = qtenginio
        url = ../qtenginio.git
 -      branch = 5.6.0
 +      branch = 5.6
-       status = obsolete
+       status = deprecated
  [submodule "qtwebsockets"]
        depends = qtbase
        recommends = qtdeclarative
diff --cc init-repository
Simple merge