Development:Unmerged files

Files with MOODLE_16_MERGED tag not updated - Sun Mar 18 23:51:39 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/Attic/utfdbmigrate.php,v 
< <?php //$Id: utfdbmigrate.php,v 1.47.2.12 2006/07/29 09:43:36 skodak Exp $ 
> <?php //$Id: utfdbmigrate.php,v 1.47.2.13 2006/09/29 03:16:51 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.166.2.9 2006/10/04 17:33:48 stronk7 Exp $ 
> <?php //$Id: restorelib.php,v 1.166.2.10 2007/03/13 17:43:10 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/header.php,v 
< <?php //$Id: header.php,v 1.19.2.3 2006/06/18 07:44:21 moodler Exp $ 
> <?php //$Id: header.php,v 1.19.2.4 2006/11/02 03:19:37 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/lib.php,v 
< <?php //$Id: lib.php,v 1.38.2.2 2006/10/07 16:34:20 gustav_delius Exp $ 
> <?php //$Id: lib.php,v 1.38.2.3 2006/11/02 05:52:48 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/filter/mediaplugin/filter.php,v 
 
RCS file: /cvsroot/moodle/moodle/grade/index.php,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.1.2.1 2006/12/29 19:20:29 skodak Exp $  
> <?PHP // $Id: currencies.php,v 1.1.2.2 2007/02/17 23:37:26 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/hotpot.php,v 
< <?PHP // $Id: hotpot.php,v 1.1.2.1 2006/05/24 11:22:07 gbateson Exp $  
> <?PHP // $Id: hotpot.php,v 1.1.2.3 2006/10/05 06:21:26 gbateson Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/hotpot/reportcontent.html,v 
 
RCS file: /cvsroot/moodle/moodle/lib/statslib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/backuplib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/restorelib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v 
< <?php // $Id: post.php,v 1.112.2.14 2007/01/12 05:03:57 vyshane Exp $ 
> <?php // $Id: post.php,v 1.94.2.9 2007/02/09 07:32:21 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/continue.php,v 
< <?php // $Id: continue.php,v 1.19.2.4 2006/09/09 17:25:21 mark-nielsen Exp $ 
> <?php // $Id: continue.php,v 1.19.2.6 2006/12/06 01:45:31 mark-nielsen Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v 
< <?php  // $Id: report.php,v 1.26.2.2 2006/09/19 09:07:44 bobopinna Exp $ 
> <?php  // $Id: report.php,v 1.26.2.3 2007/01/18 20:32:33 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.7.2.9 2007/03/15 12:58:38 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.7.2.10 2007/03/17 22:58:30 poltawski Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/config.php,v 
< <?PHP // $Id: config.php,v 1.4 2006/04/29 19:46:41 gustav_delius Exp $ 
> <?PHP // $Id: config.php,v 1.4.2.1 2006/11/02 18:10:14 watcanz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/header.html,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_fonts.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.jpg,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.psd,v 
 
RCS file: /cvsroot/moodle/moodle/theme/oceanblue/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v

Files with MOODLE_17_MERGED tag not updated - Tue Jul 17 21:06:18 CEST 2007

RCS file: /cvsroot/moodle/moodle/install.php,v 
 
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/backup/restorelib.php,v 
 
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/lang/en_utf8/admin.php,v 
< <?PHP // $Id: admin.php,v 1.55.2.23 2007/05/06 09:39:46 poltawski Exp $  
> <?PHP // $Id: admin.php,v 1.55.2.24 2007/06/19 16:26:00 jamiesensei 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/lib/environmentlib.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

Files with MOODLE_18_MERGED tag not updated - Tue Jul 17 21:11:42 CEST 2007

RCS file: /cvsroot/moodle/moodle/install.php,v 
< <?php /// $Id: install.php,v 1.65.2.7 2007/04/15 14:45:22 skodak Exp $ 
> <?php /// $Id: install.php,v 1.65.2.8 2007/06/20 06:37:01 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/moodle/version.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/README-CAS,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/auth.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/cas_form.html,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/config.html,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/languages.php,v 
< // version $Id: languages.php,v 1.2.20.1 2007/04/29 13:57:58 skodak Exp $^M 
> // version $Id: languages.php,v 1.2.20.5 2007/07/17 11:55:09 jgutierr25 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/CAS.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/client.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/domxml-php4-php5.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-db.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-file.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-main.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/english.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/french.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/german.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/greek.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/japanese.php,v 
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/languages.php,v 
 
RCS file: /cvsroot/moodle/moodle/course/edit_form.php,v 
< <?php  //$Id: edit_form.php,v 1.25.2.2 2007/04/05 07:57:19 nicolasconnault Exp $ 
> <?php  //$Id: edit_form.php,v 1.25.2.3 2007/07/13 20:12:32 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/moodle/grade/lib.php,v 
< <?php // $Id: lib.php,v 1.65.2.4 2007/05/16 20:24:04 skodak Exp $ 
> <?php // $Id: lib.php,v 1.65.2.5 2007/06/26 11:50:19 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php,v 
< <?PHP // $Id: admin.php,v 1.103.2.12 2007/05/21 13:32:39 moodler Exp $  
> <?PHP // $Id: admin.php,v 1.103.2.13 2007/06/19 16:32:07 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/auth.php,v 
< <?php // $Id: auth.php,v 1.18.2.8 2007/04/29 13:57:52 skodak Exp $  
> <?php // $Id: auth.php,v 1.18.2.9 2007/07/06 10:18:10 moodler Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/role.php,v 
< <?PHP // $Id: role.php,v 1.23.2.8 2007/04/05 09:16:35 skodak Exp $  
> <?PHP // $Id: role.php,v 1.23.2.9 2007/05/18 12:47:24 jmg324 Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/scorm.php,v 
< <?PHP // $Id: scorm.php,v 1.11.2.3 2007/06/22 05:45:20 moodler Exp $  
> <?PHP // $Id: scorm.php,v 1.11.2.6 2007/07/03 12:09:39 bobopinna Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/enrolperiod.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/breakdownoffinalgrade.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/grade.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/includeself.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/leaguetable.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/nelements.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/resubmit.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/selfassessment.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/ungradedassessments_teacher.html,v 
 
RCS file: /cvsroot/moodle/moodle/lib/blocklib.php,v 
< <?php //$Id: blocklib.php,v 1.119.2.2 2007/03/26 02:57:56 nicolasconnault Exp $ 
> <?php //$Id: blocklib.php,v 1.119.2.3 2007/05/18 12:47:20 jmg324 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/environmentlib.php,v 
< <?php  //$Id: environmentlib.php,v 1.20.2.1 2007/03/18 19:18:51 stronk7 Exp $ 
> <?php  //$Id: environmentlib.php,v 1.20.2.2 2007/06/19 16:32:07 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/html/resource.class.php,v 
< <?php // $Id: resource.class.php,v 1.34.2.2 2007/05/16 21:26:18 skodak Exp $ 
> <?php // $Id: resource.class.php,v 1.34.2.3 2007/07/06 08:38:42 urs_hunkler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v 
< <?php  // $Id: lib.php,v 1.83.2.1 2007/03/29 10:47:43 csantossaenz Exp $ 
> <?php  // $Id: lib.php,v 1.83.2.2 2007/04/10 14:21:29 csantossaenz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/locallib.php,v 
< <?php  // $Id: locallib.php,v 1.34.2.5 2007/06/06 09:16:21 moodler Exp $ 
> <?php  // $Id: locallib.php,v 1.34.2.7 2007/06/06 22:16:38 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/mod_form.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php,v 
< <?PHP  // $Id: player.php,v 1.22.2.4 2007/03/13 08:28:47 moodler Exp $ 
> <?PHP  // $Id: player.php,v 1.22.2.6 2007/07/03 09:36:31 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/styles.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php,v 
< <?php // $Id: version.php,v 1.49.2.1 2007/03/13 22:09:24 bobopinna Exp $ 
> <?php // $Id: version.php,v 1.49.2.2 2007/07/03 07:55:33 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12.js.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php,v 
< <?php // $Id: scorm_12lib.php,v 1.4.2.1 2007/03/15 21:23:14 bobopinna Exp $ 
> <?php // $Id: scorm_12lib.php,v 1.4.2.5 2007/06/20 09:23:22 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v 
< <?php // $Id: scorm_13lib.php,v 1.6 2007/01/16 14:03:15 bobopinna Exp $ 
> <?php // $Id: scorm_13lib.php,v 1.6.2.1 2007/06/20 09:23:24 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/upgrade.php,v 
< <?php  //$Id: upgrade.php,v 1.8.2.2 2007/03/15 07:45:32 bobopinna Exp $ 
> <?php  //$Id: upgrade.php,v 1.8.2.3 2007/07/03 07:54:32 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/my/pagelib.php,v 
< <?php  //$Id: pagelib.php,v 1.10 2006/09/08 08:46:28 toyomoyo Exp $ 
> <?php  //$Id: pagelib.php,v 1.10.6.1 2007/05/18 12:47:20 jmg324 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/Attic/question2.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.6.1 2007/06/25 12:19:56 urs_hunkler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_ie6.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_ie7.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v

To generate this information yourself

Run the following commandline at the top level of your CVS sandbox:

cvs diff -r MOODLE_18_MERGED -r MOODLE_18_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] \/\/ \$Id)' > unmergedfiles.txt; cat unmergedfiles.txt

Some useful links

• Moodle CVS for developers: explains how to work with the Moodle code in CVS.
• Review Unmerged files, please... discussion from moodle.org forums.