]> AND Private Git Repository - kahina_paper1.git/commitdiff
Logo AND Algorithmique Numérique Distribuée
Private GIT Repository
projects / kahina_paper1.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f44fe5 5870d4e)
Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/kahina_paper1
authorcouturie <couturie@extinction>
Mon, 2 Nov 2015 15:27:10 +0000 (10:27 -0500)
committercouturie <couturie@extinction>
Mon, 2 Nov 2015 15:27:10 +0000 (10:27 -0500)
Conflicts:
paper.tex

1  2 
paper.tex patch | diff1 | diff2 | blob | history

diff --cc paper.tex
Simple merge
1st paper