]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into ThomasBalastegui-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 20 May 2016 15:56:22 +0000 (17:56 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 20 May 2016 15:56:22 +0000 (17:56 +0200)
commit129d79ec53410e790c36a25d451d38c538c8f8eb
treefd98ec9b1b1ed5ad281c8f37f0f157136bee3200
parent7b8f777d11d1ec09cf7faa47c39b9df95cef9640
parentf93391335f541dac8ad6aa65a63a6effbdcb49c4
Merge branch 'dev' into ThomasBalastegui-dev