diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-10-11 09:53:21 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-11 09:54:40 +0200 |
commit | df7df0d4921ba32e73cc527a818d745c6392b34f (patch) | |
tree | 05d55bf613f1e97a4cd0898d879009b888741984 | |
parent | 783e0014a86d4f0ba0496ed65f864a29b9815963 (diff) | |
parent | b8a6fe338c6551c4e2656ca277244140573ecfb7 (diff) |
Merge remote-tracking branch 'origin/4.4' into 4.54.5
Change-Id: I85103fe150fee03027b288f9d1b934330d870b0b
-rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index b58ead0..f52685d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "qtcreator"] path = qtcreator url = ../qt-creator - branch = master + branch = 4.5 [submodule "fossil"] path = plugins/fossil url = ../plugin-fossil-scm depends = qtcreator - branch = master + branch = 4.5 |