]> git.immae.eu Git - perso/Denise/aventuriers.git/commitdiff
projects / perso / Denise / aventuriers.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3530ed 8532a73)
Merge branch 'master' of immae.eu:perso/Denise/aventuriers
authorDenise sur sakamain <sekhmet@sakamain.(none)>
Wed, 17 Dec 2014 19:16:11 +0000 (20:16 +0100)
committerDenise sur sakamain <sekhmet@sakamain.(none)>
Wed, 17 Dec 2014 19:16:11 +0000 (20:16 +0100)
Conflicts:
aventuriers.html
aventuriers.pdf
html/aventuriers.html

1  2 
aventuriers.html patch | diff1 | diff2 | blob | history
aventuriers.pdf patch | diff1 | diff2 | blob | history
html/aventuriers.html patch | diff1 | diff2 | blob | history

diff --cc aventuriers.html
index 5de7cbacae8f6c165225e88aca265dc7dcfab8b8,a4403eafaa0c4e68a7478a9919e1336e2e3da0df..cc8401623e2de5a998dc4d352e3cce9b2d38f08a
--- 1/aventuriers.html
--- 2/aventuriers.html
+++ b/aventuriers.html
@@@ -7,7 -7,7 +7,7 @@@
  <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> 
  <!-- html --> 
  <meta name="src" content="aventuriers.tex"> 
- <meta name="date" content="2014-12-17 20:13:00"> 
 -<meta name="date" content="2014-12-16 19:26:00"> 
++<meta name="date" content="2014-12-17 20:16:00"> 
  <link rel="stylesheet" type="text/css" href="aventuriers.css"> 
  </head><body 
  >
diff --cc aventuriers.pdf
index 512a060a56c9d49becde249a31648034f96f3ddd,19b78475f7aa70b7411df3249da77dda834cb3c8..0eaa23434f892f59b9628427f7d14fdd4ed8266b
Binary files differ
diff --cc html/aventuriers.html
index 5de7cbacae8f6c165225e88aca265dc7dcfab8b8,a4403eafaa0c4e68a7478a9919e1336e2e3da0df..cc8401623e2de5a998dc4d352e3cce9b2d38f08a
--- 1/html/aventuriers.html
--- 2/html/aventuriers.html
+++ b/html/aventuriers.html
@@@ -7,7 -7,7 +7,7 @@@
  <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> 
  <!-- html --> 
  <meta name="src" content="aventuriers.tex"> 
- <meta name="date" content="2014-12-17 20:13:00"> 
 -<meta name="date" content="2014-12-16 19:26:00"> 
++<meta name="date" content="2014-12-17 20:16:00"> 
  <link rel="stylesheet" type="text/css" href="aventuriers.css"> 
  </head><body 
  >