summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-24 14:34:50 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-24 14:36:21 +0200
commit99d5d08273a935b827759db188f9d9ca05bd4ad0 (patch)
tree0ff7d73e0b739881f5b74756b33f7691de29bca1 /.gitmodules
parent2f67e07e7a89cb814c9a764ef99a1cda1df5874c (diff)
parent0e6c8c34d128c9bada575193f8da25268285622c (diff)
Merge remote-tracking branch 'origin/5.6' into 5.9
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index a77eaedc..43f7023f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,10 @@
[submodule "sources/pyside2-tools"]
path = sources/pyside2-tools
+ branch = 5.9
url = ../pyside-tools.git
[submodule "sources/pyside2-examples"]
path = sources/pyside2-examples
+ branch = 5.9
url = ../examples.git
[submodule "wiki"]
path = wiki