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:
parent
8b7d5260fb
commit
f0fbe14cf5
1 changed files with 0 additions and 10 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue