projects
/
Faustine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'OOP' of https://scm.cri.ensmp.fr/git/Faustine into OOP
[Faustine.git]
/
README
diff --git
a/README
b/README
index
b4955fc
..
3285a0d
100644
(file)
--- a/
README
+++ b/
README
@@
-64,3
+64,6
@@
The OCaml manual is distributed in HTML, PDF, Postscript, DVI, and
Emacs Info files. It is available on the World Wide Web, at
http://caml.inria.fr/
+
+git test
+Merge test