Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Mon Aug 6 19:42:37 CEST 2007

RCS file: [/cvsroot/moodle/moodle/auth/ldap/Attic/lib.php],v
<  * @version $Id: lib.php,v 1.83.2.2 2006/12/29 21:18:37 skodak Exp $ 
>  * @version $Id: lib.php,v 1.83.2.3 2007/05/21 05:27:54 moodler Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/blocks/db/Attic/migrate2utf8.php],v
< <?php // $Id: migrate2utf8.php,v 1.9 2006/06/08 04:08:04 toyomoyo Exp $ 
> <?php // $Id: migrate2utf8.php,v 1.9.4.1 2007/02/28 00:10:12 martinlanghoff Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/course/Attic/edit.html],v
 
RCS file: [/cvsroot/moodle/moodle/course/lib.php],v
< <?php  // $Id: lib.php,v 1.446.2.10 2007/04/01 15:51:05 moodler Exp $ 
> <?php  // $Id: lib.php,v 1.446.2.11 2007/07/27 18:45:24 mchurch Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/lang/en_utf8/scorm.php],v
< <?PHP // $Id: scorm.php,v 1.9.2.2 2007/03/13 08:47:52 moodler Exp $  
> <?PHP // $Id: scorm.php,v 1.9.2.3 2007/07/03 08:05:57 bobopinna Exp $  
 
RCS file: [/cvsroot/moodle/moodle/lang/en_utf8/docs/README.txt],v
 
RCS file: [/cvsroot/moodle/moodle/lib/accesslib.php],v
 
RCS file: [/cvsroot/moodle/moodle/lib/db/Attic/migrate2utf8.php],v
< <?php // $Id: migrate2utf8.php,v 1.26.2.1 2006/10/22 22:57:27 stronk7 Exp $ 
> <?php // $Id: migrate2utf8.php,v 1.26.2.2 2007/04/02 08:41:57 toyomoyo Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/mod/scorm/lib.php],v
< <?php  // $Id: lib.php,v 1.76.2.2 2007/03/29 08:18:35 csantossaenz Exp $ 
> <?php  // $Id: lib.php,v 1.76.2.3 2007/07/03 14:11:20 bobopinna Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/mod/scorm/Attic/mod.html],v
 
RCS file: [/cvsroot/moodle/moodle/mod/scorm/player.php],v
< <?PHP  // $Id: player.php,v 1.16.2.4 2007/03/15 15:25:51 bobopinna Exp $ 
> <?PHP  // $Id: player.php,v 1.16.2.5 2007/07/08 00:15:39 poltawski Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/mod/scorm/Attic/validate.php],v
< <?php // $Id: validate.php,v 1.17.4.1 2007/03/15 15:54:36 bobopinna Exp $ 
> <?php // $Id: validate.php,v 1.17.4.2 2007/07/03 09:24:38 bobopinna Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php],v
 
RCS file: [/cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php],v
 
RCS file: [/cvsroot/moodle/moodle/theme/chameleon/config.php],v
< <?PHP // $Id: config.php,v 1.5 2006/09/28 10:32:25 jamiesensei Exp $ 
> <?PHP // $Id: config.php,v 1.5.2.1 2007/06/25 12:21:58 urs_hunkler Exp $ 
 
RCS file: [/cvsroot/moodle/moodle/theme/standard/styles_color.css],v