]> git.parisson.com Git - mezzo.git/commitdiff
Add bin dev branch and update
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 6 Mar 2018 16:22:08 +0000 (17:22 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 6 Mar 2018 16:22:08 +0000 (17:22 +0100)
.gitignore
.gitmodules
bin

index b770445e1b6e09498c6fedabd5ed8cbacb0da89a..b135a8f7c89caf5087681e8243a76121a64a8ada 100644 (file)
@@ -88,4 +88,3 @@ $RECYCLE.BIN/
 
 sources
 .vscode/*
-
index 79d0b4db73ac1d86530820af81554db52d4fad02..8d5457d94af0cede98cc52f6eb4f16db46f90ea8 100644 (file)
@@ -18,7 +18,7 @@
     path = bin
     url = git@github.com:Ircam-Web/mezzo-bin.git
     branch-master = master
-    branch-dev = master
+    branch-dev = dev
 [submodule "lib/grappelli-safe"]
     path = lib/grappelli-safe
     url = git@github.com:yomguy/grappelli-safe.git
diff --git a/bin b/bin
index a154d2390a03921699e502a00963bb84d44fa3c5..799d79203fcdc59465bc1efa4b3ba1cf4b00de6e 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit a154d2390a03921699e502a00963bb84d44fa3c5
+Subproject commit 799d79203fcdc59465bc1efa4b3ba1cf4b00de6e