]> git.parisson.com Git - mezzo.git/commitdiff
update submodule branches
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 6 Dec 2017 09:10:24 +0000 (10:10 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 6 Dec 2017 09:10:24 +0000 (10:10 +0100)
.gitmodules
bin
lib/mezzanine
lib/mezzanine-organization

index b1bd4d083d385c98b3eb00c8db40a8434d11e5ab..0a380ea2eaa2bea6ce18c43a446543b0d7fbd5d6 100644 (file)
@@ -1,8 +1,8 @@
 [submodule "lib/mezzanine"]
        path = lib/mezzanine
        url = https://github.com/yomguy/mezzanine.git
-    branch-master = master
-    branch-dev = master
+    branch-master = mezzo
+    branch-dev = mezzo
 [submodule "lib/mezzanine-agenda"]
        path = lib/mezzanine-agenda
     url = https://github.com/Ircam-Web/mezzanine-agenda.git 
diff --git a/bin b/bin
index bd10204051c2677dcbb02045ee87629910054a9e..5206263b35a5a6edec07a282a79a47245a0d5495 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit bd10204051c2677dcbb02045ee87629910054a9e
+Subproject commit 5206263b35a5a6edec07a282a79a47245a0d5495
index 72380cb5c6a2c9fc0f439b9277dc88285d63d001..36b6bffac40111c37fd3f0ef435ffc3f79f93793 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 72380cb5c6a2c9fc0f439b9277dc88285d63d001
+Subproject commit 36b6bffac40111c37fd3f0ef435ffc3f79f93793
index 0dc91551ecadc3b12d5502dcbb16fda0e15bb636..7cb33f555fe436d464f961f486d83b448de7a7f4 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0dc91551ecadc3b12d5502dcbb16fda0e15bb636
+Subproject commit 7cb33f555fe436d464f961f486d83b448de7a7f4