]> git.parisson.com Git - timeside.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)
commit956e5fa040c495390f580600ddd42663ebc8994c
tree8c5e2eb0205b4c3d9e6a9acf01daa0d2171f161e
parent24f670433948a92fef4ba2bf5fa9654a0db46cdd
parentb9b69e03887197d883df9be0a3534f40bcc75f99
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
doc/source/tutorial/Streaming.rst