diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-14 23:11:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-14 23:11:30 +0200 |
| commit | e10a2d4ffe7a1e55e660a487f8357070afd990c4 (patch) | |
| tree | 75119e711cf3d38e891f62d8f931e386763f9e5b /.gitmodules | |
| parent | 74eab55ea83a9919e0a3085015d2e522bd351ac1 (diff) | |
| parent | f2af07b8edafa15594eed67afb68dc2481721541 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.gitmodules
Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 762ce50a..5bd390c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,7 +49,7 @@ path = qtxmlpatterns url = ../qtxmlpatterns.git branch = dev - status = addon + status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations |