diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-20 13:07:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-20 13:17:05 +0100 |
| commit | 4afaae402017c0192d02d1c4b048eff7a0f92f60 (patch) | |
| tree | e41ca007e002336ab6a04178bed93a4dbfe50ee8 /.gitmodules | |
| parent | 811a77a53c9e5a05e01928f8efb6678e4637a4bf (diff) | |
| parent | 43a2c55cdea1098a23221915571445c1d5f23c2b (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 6a2e68a1..90a794c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -108,6 +108,7 @@ path = qt3d url = ../qt3d.git branch = dev + initrepo = true [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git |