]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Dec 2015 23:17:18 +0000 (00:17 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Dec 2015 23:17:18 +0000 (00:17 +0100)
commitd67a56bf77b1905281028e3a06904a722c2946ef
tree66aadbac3f8cf1894f02ca8f30445dcfcd3c4ec3
parent9175d7c5c25254884a80cad76b92200858cf0a95
parent9573cb07651edaff5ac4d8318de1d273e069322b
Merge branch 'dev' into crem