]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'master' of vcs.parisson.com:/var/git/telemeta-doc
authorThomas Fillon <thomas@parisson.com>
Mon, 24 Jun 2013 13:02:39 +0000 (15:02 +0200)
committerThomas Fillon <thomas@parisson.com>
Mon, 24 Jun 2013 13:02:39 +0000 (15:02 +0200)
commit6ea2c4db87dd22b7e94d397d936d2ddbf5a4819f
tree95630e2b9f44219453bba7da17722bd1e0e92d1d
parent8af3d33b3c54bc292095e2b7329e2ae9871d87aa
parent6028ddcf823d0545f9352e684c661f1f20d49c1e
Merge branch 'master' of vcs.parisson.com:/var/git/telemeta-doc

Merge des conflits entre les modifications simultanées de Guilaume et Thomas
Conflicts:
CMMR_2013/cmmr_2013_Telemeta.pdf
CMMR_2013/cmmr_2013_Telemeta.tex
CMMR_2013/cmmr_2013_Telemeta.pdf
CMMR_2013/cmmr_2013_Telemeta.tex