rpl/src/combinaisons.F90 - diff

Return to combinaisons.F90 CVS log

Up to [local] / rpl / src

-version 1.17, 2011/04/11 12:10:04
+version 1.18, 2011/04/20 08:26:04
  Line 16
  ! You should have received a copy of the CeCILL License
  ! along with RPL/2. If not, write to info@cecill.info.
  !===============================================================================
+ <<<<<<< combinaisons.F90
+ ! RPL/2 (R) version 4.1.0.prerelease.0
+ =======
+ ! RPL/2 (R) version 4.0.23
+ >>>>>>> 1.16.2.2
+ ! Copyright (C) 1989-2011 Dr. BERTRAND Joël
+ !
+ ! This file is part of RPL/2.
+ !
+ ! RPL/2 is free software; you can redistribute it and/or modify it
+ ! under the terms of the CeCILL V2 License as published by the french
+ ! CEA, CNRS and INRIA.
+ !
+ ! RPL/2 is distributed in the hope that it will be useful, but WITHOUT
+ ! ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ ! FITNESS FOR A PARTICULAR PURPOSE.  See the CeCILL V2 License
+ ! for more details.
+ !
+ ! You should have received a copy of the CeCILL License
+ ! along with RPL/2. If not, write to info@cecill.info.
+ !===============================================================================
  #include "rplftypes-conv.inc"