From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 6 Mar 2018 16:22:08 +0000 (+0100)
Subject: Add bin dev branch and update
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a637485a857e75bec6f2f06ae53b164b9b08ca97;p=mezzo.git

Add bin dev branch and update
---

diff --git a/.gitignore b/.gitignore
index b770445e..b135a8f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,4 +88,3 @@ $RECYCLE.BIN/
 
 sources
 .vscode/*
-
diff --git a/.gitmodules b/.gitmodules
index 79d0b4db..8d5457d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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 a154d239..799d7920 160000
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit a154d2390a03921699e502a00963bb84d44fa3c5
+Subproject commit 799d79203fcdc59465bc1efa4b3ba1cf4b00de6e