]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 Oct 2014 13:00:55 +0000 (15:00 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 Oct 2014 13:00:55 +0000 (15:00 +0200)
commit09a5f8590f21e1898d5ef50ba1576f9087b72ea0
tree59c4a6475f0a593fe2f73cbb1b3920583d92d367
parent8bf65aa6dbb1a200bc268e0013e74fa3fc4df847
parentf08bab4ca403ae3dfddffbca7e830b7b3d2eedc9
Merge branch 'dev' of github.com:yomguy/TimeSide into dev

Conflicts:
README.rst
doc/source/dive_in.rst
doc/source/intro.rst
doc/source/news.rst
doc/source/tutorial/Streaming.rst
README.rst