]> git.parisson.com Git - telemeta-doc.git/commit
projects / telemeta-doc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e657c5f 221036c)
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Jun 2015 23:22:07 +0000 (01:22 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 11 Jun 2015 23:22:07 +0000 (01:22 +0200)
commit4cf8f10521d2fdfcae28ad5a67ff280327284cd8
tree0b07ee4886fc40cf19501655ff4b208f5c218eaatree | snapshot
parente657c5f0cc6f4e18cb2beb2000db971bc9fafc86commit | diff
parent221036c298fc9bffe6ec39023801d253563b8b89commit | diff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev

Conflicts:
Conferences/2015_FMA/slides_FMA_2015.tex
Conferences/2015_FMA/slides_FMA_2015.tex diff1 | diff2 | blob | history
Articles, conference papers and other documents related to Telemeta and TimeSide