]> git.parisson.com Git - telemeta-doc.git/commit
projects / telemeta-doc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9716a06 c64959b)
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 10 Jun 2014 09:26:24 +0000 (11:26 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 10 Jun 2014 09:26:24 +0000 (11:26 +0200)
commitba13a9c66877e837867ccf7b8ab2e5c46f934265
treeabb3b2da935735f4e501951536193e5077026fa6tree | snapshot
parent9716a06df92f06fde957bcb5eac4dd21752604e8commit | diff
parentc64959b8d5da8863bc56857038ded4d6ba5ec49ecommit | diff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev

Conflicts:
Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex
Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex diff1 | diff2 | blob | history
Articles, conference papers and other documents related to Telemeta and TimeSide