Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Wed, 20 Nov 2013 15:51:13 +0000 (16:51 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 20 Nov 2013 15:51:13 +0000 (16:51 +0100)
1  2 
README
manifold/manifoldapi.py

diff --cc README
Simple merge
Simple merge