]> git.parisson.com Git - telemeta-doc.git/commit
projects / telemeta-doc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca1b23a 12755ba)
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 8 Jul 2014 07:38:28 +0000 (09:38 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 8 Jul 2014 07:38:28 +0000 (09:38 +0200)
commit249b221b2fec49013ac4abc2a81e86b18eda2e11
treed7ea70df62fb5a9739cacac502e3a3872305b806tree | snapshot
parentca1b23a5c8ee6ea70dd28c55bfeccff682cb92b5commit | diff
parent12755bae10757a22ffd0bb4a4ffabaf03f1ca865commit | diff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev

Conflicts:
Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.pdf
Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.pdf diff1 | diff2 | blob | history
Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.tex diff1 | diff2 | blob | history
Articles, conference papers and other documents related to Telemeta and TimeSide