merge ParadisEO-MOEO v-1.0
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@400 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
d46e17d10a
commit
8b7d5260fb
724 changed files with 63305 additions and 2757 deletions
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< .courant
|
||||
* release 1.0.alpha
|
||||
|
||||
# Local Variables:
|
||||
|
|
@ -5,3 +6,6 @@
|
|||
# mode: text
|
||||
# fill-column: 80
|
||||
# End:
|
||||
=======
|
||||
* release 1.0
|
||||
>>>>>>> .fusion-droit.r399
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue