test: README@4ea086d67cb1 (annotated)

84 4ea086d67cb1 Test avant merge veltr parents: 80 diff changeset	1	Voici de lourdes modifications pour compliquer le merge
16 b9ca2111a272 change line endings to unix ymh <ymh.work@gmail.com> parents: 13 diff changeset	2
b9ca2111a272 change line endings to unix ymh <ymh.work@gmail.com> parents: 13 diff changeset	3	Hello world by Santiago
b9ca2111a272 change line endings to unix ymh <ymh.work@gmail.com> parents: 13 diff changeset	4
b9ca2111a272 change line endings to unix ymh <ymh.work@gmail.com> parents: 13 diff changeset	5	Test 2
24 6d4e4ada7590 Removed unused stuff Boris de Laage <bdelaage@universcine.com> parents: 20 diff changeset	6
6d4e4ada7590 Removed unused stuff Boris de Laage <bdelaage@universcine.com> parents: 20 diff changeset	7	Geia sou kosmos
28 36d9290f1091 test from murky ymh <ymh.work@gmail.com> parents: 24 diff changeset	8
36d9290f1091 test from murky ymh <ymh.work@gmail.com> parents: 24 diff changeset	9	beep beep
29 b79f40f773fe This a test with the Gautier login ymh <ymh.work@gmail.com> parents: 28 diff changeset	10
84 4ea086d67cb1 Test avant merge veltr parents: 80 diff changeset	11	Hello World
4ea086d67cb1 Test avant merge veltr parents: 80 diff changeset	12
29 b79f40f773fe This a test with the Gautier login ymh <ymh.work@gmail.com> parents: 28 diff changeset	13	toto from gautier
50 18ec53c9192f Merge with 25559acf1f833d99bf7a232563bf8d3ef2e94328 ymh <ymh.work@gmail.com> parents: 29 25 diff changeset	14	In branch boris - merged
54 32c068f50fd1 sadasd ymh <ymh.work@gmail.com> parents: 53 diff changeset	15
32c068f50fd1 sadasd ymh <ymh.work@gmail.com> parents: 53 diff changeset	16	Another test sdsad\
32c068f50fd1 sadasd ymh <ymh.work@gmail.com> parents: 53 diff changeset	17	aasdasd
32c068f50fd1 sadasd ymh <ymh.work@gmail.com> parents: 53 diff changeset	18
57 957da92c9fb6 new commit Julia Anaya <julia.anaya@gmail.com> parents: 56 diff changeset	19	asdfsa
54 32c068f50fd1 sadasd ymh <ymh.work@gmail.com> parents: 53 diff changeset	20
80 cb2b649a228e nouvelle ligne Anthony Ly <anthonyly.com@gmail.com> parents: 57 diff changeset	21	Nouvelle ligne
84 4ea086d67cb1 Test avant merge veltr parents: 80 diff changeset	22
4ea086d67cb1 Test avant merge veltr parents: 80 diff changeset	23	Moi aussi j'écris à la fin

author	veltr
	Wed, 03 Oct 2012 11:02:12 +0200
changeset 84	4ea086d67cb1
parent 80	cb2b649a228e
child 87	0b1e09cbe160
permissions	-rw-r--r--