diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-23 12:24:59 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-23 12:24:59 +0200 |
| commit | 433e143b231a7cc7f1b37ce85d5ee6c3e06efab0 (patch) | |
| tree | 6e89a975e9d569b69239059c7a0d0efe0fcb2687 /.gitmodules | |
| parent | e39f4e8b4be5da3d549c740ba396576bff7f952d (diff) | |
| parent | acd97fec50d85bc9c82ea5ab49072acf992a0d0b (diff) | |
Merge branch 'dev' into stable
Conflicts:
qtjsbackend
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 8fbcde15..027a1274 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,9 +73,6 @@ [submodule "qt3d"] path = qt3d url = ../qt3d.git -[submodule "qtjsbackend"] - path = qtjsbackend - url = ../qtjsbackend.git [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git |