merge ParadisEO-MOEO v-1.0

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@401 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-06-26 13:34:01 +00:00
commit f0fbe14cf5

View file

@ -1,11 +1 @@
<<<<<<< .courant
* release 1.0.alpha
# Local Variables:
# coding: iso-8859-1
# mode: text
# fill-column: 80
# End:
=======
* release 1.0
>>>>>>> .fusion-droit.r399