aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-12-15 19:05:02 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-12-15 19:05:02 +0100
commit7b30d85bdcea536c7606d205bece5b036d74027c (patch)
tree8fa946c5b6535e19c24411a2888503169df3f4b7 /.gitmodules
parente4ff528bb67871fc51578cff2e0f2e65310a4c98 (diff)
parenta93760f957332f826383936f11026c273a2ab5a4 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 287f82a4..efabf18d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -190,3 +190,7 @@
url = ../qtquickcontrols2.git
branch = dev
initrepo = true
+[submodule "qtpurchasing"]
+ path = qtpurchasing
+ url = ../qtpurchasing.git
+ branch = dev