diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
| commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
| tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /.gitmodules | |
| parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 7144b246..1fc98730 100644 --- a/.gitmodules +++ b/.gitmodules @@ -298,7 +298,6 @@ status = addon [submodule "qtnetworkauth"] depends = qtbase - recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git branch = dev |