aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-05-09 13:47:20 +0200
committerEike Ziller <eike.ziller@qt.io>2018-05-09 11:47:45 +0000
commit73bb1d7a6a0b49836492a3ae8fcfc61bbfdbd3f2 (patch)
tree57f5fb98e6c8f9fcf8a6374b56ab0df9c71d12db
parentcaba6b489050227e876d9478a4ec5815c06fce37 (diff)
Update .gitmodules for 4.7 branch4.7
Change-Id: I64acba99c4637ae9a4f2662201abc0b17c31b85d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--.gitmodules6
m---------plugins/haskell0
m---------qtcreator0
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index fe70822..189a612 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,14 +1,14 @@
[submodule "qtcreator"]
path = qtcreator
url = ../qt-creator
- branch = master
+ branch = 4.7
[submodule "fossil"]
path = plugins/fossil
url = ../plugin-fossil-scm
depends = qtcreator
- branch = master
+ branch = 4.7
[submodule "haskell"]
path = plugins/haskell
url = ../plugin-haskell
depends = qtcreator
- branch = master
+ branch = 4.7
diff --git a/plugins/haskell b/plugins/haskell
-Subproject 01c0fa565f95d75ea2745f246a17dc0e15dc717
+Subproject 103d6e8d7b699c90a32deec1e9dcc07181e738d
diff --git a/qtcreator b/qtcreator
-Subproject 8f53c02296ee2c25012cb446ccbb6a544510f8f
+Subproject ee8b4f35123f8ee3b11e4a4ac512456d184dbaf