]> git.parisson.com Git - telemeta-doc.git/commitdiff
projects / telemeta-doc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bc36a3 6ea2c4d)
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 24 Jun 2013 14:02:13 +0000 (16:02 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 24 Jun 2013 14:02:13 +0000 (16:02 +0200)
Conflicts:
CMMR_2013/cmmr_2013_Telemeta.pdf


Trivial merge
Articles, conference papers and other documents related to Telemeta and TimeSide