--- rpl/src/combinaisons.F90	2010/07/14 14:19:33	1.10
+++ rpl/src/combinaisons.F90	2011/04/21 16:00:53	1.19
@@ -1,6 +1,27 @@
 !===============================================================================
-! RPL/2 (R) version 4.0.18
-! Copyright (C) 1989-2010 Dr. BERTRAND Joël
+! RPL/2 (R) version 4.1.0.prerelease.0
+! 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.
+!===============================================================================
+<<<<<<< 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.
 !
@@ -18,7 +39,7 @@
 !===============================================================================
 
 
-#include "rplftypes.conv.inc"
+#include "rplftypes-conv.inc"
 
 
 !===============================================================================