8b7d5260fb
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@400 331e1502-861f-0410-8da2-ba01fb791d7f
11 lines
165 B
Text
11 lines
165 B
Text
<<<<<<< .courant
|
|
* release 1.0.alpha
|
|
|
|
# Local Variables:
|
|
# coding: iso-8859-1
|
|
# mode: text
|
|
# fill-column: 80
|
|
# End:
|
|
=======
|
|
* release 1.0
|
|
>>>>>>> .fusion-droit.r399
|