]> AND Private Git Repository - hdrcouchot.git/commitdiff
Logo AND Algorithmique Numérique Distribuée
Private GIT Repository
projects / hdrcouchot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28d5e9e 6038581)
azerazerzer
authorJean-François Couchot <couchot@couchot.iut-bm.univ-fcomte.fr>
Fri, 22 May 2015 08:26:03 +0000 (10:26 +0200)
committerJean-François Couchot <couchot@couchot.iut-bm.univ-fcomte.fr>
Fri, 22 May 2015 08:26:03 +0000 (10:26 +0200)
Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/hdrcouchot

1  2 
main.tex patch | diff1 | diff2 | blob | history
sdd.tex patch | diff1 | diff2 | blob | history

diff --cc main.tex
Simple merge
diff --cc sdd.tex
Simple merge
HDR JFC