diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 16:15:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 16:15:56 +0300 |
| commit | 5884c9f1ba45b8285930508b8ee04279a7b0b387 (patch) | |
| tree | 11a71aea12aa2e4bf6121f21c041d0da7296928d /.gitmodules | |
| parent | 3b6eaf8d96bce59756f669e0c5105ae3bb31bef8 (diff) | |
| parent | cc93a66e71a9de09cb41d4433be86e0f056d2b6f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 02875320630..11ce247b455 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,18 +3,22 @@ url = ../blender-addons.git branch = blender2.8 ignore = all + branch = master [submodule "release/scripts/addons_contrib"] path = release/scripts/addons_contrib url = ../blender-addons-contrib.git branch = master ignore = all + branch = master [submodule "release/datafiles/locale"] path = release/datafiles/locale url = ../blender-translations.git branch = master ignore = all + branch = master [submodule "source/tools"] path = source/tools url = ../blender-dev-tools.git branch = master ignore = all + branch = master |