Commit: d02a5c625acad2bc03f6f796f10eca6b1eb7f3a9
Author: Dilith Jayakody
Date: Sat Jan 29 12:27:43 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBd02a5c625acad2bc03f6f796f10eca6b1eb7f3a9
Fix issue when merging master
===================================================================
M .gitmodules
M release/datafiles/locale
===================================================================
diff --git a/.gitmodules b/.gitmodules
index a965911e90f..a8f3a3f80ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,8 @@
+[submodule "release/scripts/addons"]
+ path = release/scripts/addons
+ url = ../blender-addons.git
+ branch = master
+ ignore = all
[submodule "release/scripts/addons_contrib"]
path = release/scripts/addons_contrib
url = ../blender-addons-contrib.git
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 68f8874599d..93612eddc7c 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 68f8874599d7fbac10fa332535450d8a78fafda2
+Subproject commit 93612eddc7cdfa82d1e7c31c362df0988388629b
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
