diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-10 12:32:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-10 12:32:03 +0200 |
| commit | e568a942ec8d5b25de810cc22f53b45a3078fcfe (patch) | |
| tree | 5c888b66c9822d40bd6a56a85923905c04451bbf /.gitmodules | |
| parent | 4ace6667f286e81eeac6e27dfbe5c38b01f80b7c (diff) | |
| parent | 6a4d5e4bc80ffbe4c8b4ff067f9b81fc8365b526 (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
.gitmodules
Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 6c17f09f..b88ba6a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -164,7 +164,7 @@ path = qtquick1 url = ../qtquick1.git branch = 5.7 - status = obsolete + status = ignore [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -220,7 +220,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.7 - status = obsolete + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative |