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 - Thu May 10 16:45:38 CEST 2007

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/blocks/rss_client/block_rss_client_action.php,v 
< <?php //$Id: block_rss_client_action.php,v 1.50 2006/10/08 18:55:19 skodak Exp $ 
> <?php //$Id: block_rss_client_action.php,v 1.50.2.1 2007/04/12 02:17:09 toyomoyo Exp $ 
< * @version  $Id: block_rss_client_action.php,v 1.50 2006/10/08 18:55:19 skodak Exp $ 
> * @version  $Id: block_rss_client_action.php,v 1.50.2.1 2007/04/12 02:17:09 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/index.php,v 
< <?php // $Id: index.php,v 1.29.2.1 2007/03/15 06:14:08 toyomoyo Exp $ 
> <?php // $Id: index.php,v 1.29.2.2 2007/04/10 05:15:14 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/lib.php,v 
< <?php //$Id: lib.php,v 1.50.2.6 2007/03/23 01:42:19 toyomoyo Exp $ 
> <?php //$Id: lib.php,v 1.50.2.9 2007/04/10 05:15:14 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/calendar/lib.php,v 
< <?php // $Id: lib.php,v 1.151.2.7 2007/03/06 01:37:54 moodler Exp $ 
> <?php // $Id: lib.php,v 1.151.2.8 2007/04/05 08:00:40 toyomoyo 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.22 2007/03/19 06:40:59 toyomoyo Exp $  
> <?PHP // $Id: admin.php,v 1.55.2.23 2007/05/06 09:39:46 poltawski Exp $  
 
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v 
 
RCS file: /cvsroot/moodle/moodle/lib/datalib.php,v 
 
RCS file: /cvsroot/moodle/moodle/lib/db/access.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/lib/editor/htmlarea/popups/fullscreen.php,v 
< <?php // $Id: fullscreen.php,v 1.2.8.1 2006/10/14 07:27:31 moodler Exp $ 
> <?php // $Id: fullscreen.php,v 1.2.8.2 2007/04/09 20:38:49 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v 
< <?php  // $Id: lib.php,v 1.489.2.36 2007/03/21 06:05:13 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.489.2.37 2007/04/18 06:56:33 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v

Files with MOODLE_18_MERGED tag not updated - Sat May 5 21:36:10 CEST 2007

RCS file: /cvsroot/moodle/moodle/version.php,v 
 
RCS file: /cvsroot/moodle/moodle/admin/mnet/trustedhosts.html,v 
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php,v 
 
RCS file: /cvsroot/moodle/moodle/blocks/glossary_random/config_instance.html,v 
 
RCS file: /cvsroot/moodle/moodle/course/category.php,v 
< <?php // $Id: category.php,v 1.93.2.9 2007/04/26 08:48:07 moodler Exp $ 
> <?php // $Id: category.php,v 1.93.2.10 2007/04/30 17:59:29 andreabix Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/group.php,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/lams.php,v 
< <?PHP // $Id: lams.php,v 1.4 2006/11/01 09:44:05 moodler Exp $  
> <?PHP // $Id: lams.php,v 1.4.4.1 2007/04/23 04:13:02 nicolasconnault Exp $  
 
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v 
 
RCS file: /cvsroot/moodle/moodle/lib/db/access.php,v 
 
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v 
< <?PHP  //$Id: upgrade.php,v 1.27.2.12 2007/03/26 21:46:42 skodak Exp $ 
> <?PHP  //$Id: upgrade.php,v 1.27.2.13 2007/04/16 02:45:50 ikawhero Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/editor/htmlarea/popups/fullscreen.php,v 
< <?php // $Id: fullscreen.php,v 1.5 2007/01/27 23:23:45 skodak Exp $ 
> <?php // $Id: fullscreen.php,v 1.5.2.1 2007/04/09 20:39:41 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/simpletest/testmodforumlib.php,v 
< <?php // $Id: testmodforumlib.php,v 1.1.2.1 2007/03/12 05:27:43 nicolasconnault Exp $ 
> <?php // $Id: testmodforumlib.php,v 1.1.2.2 2007/03/14 00:45:10 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/lib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/peer.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php,v 
 
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.3 2007/03/14 00:15:25 moodler Exp $ 
> <?php  // $Id: locallib.php,v 1.34.2.4 2007/04/12 09:22:20 csantossaenz Exp $ 
 
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.2 2007/04/12 09:27:22 csantossaenz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v 
 
RCS file: /cvsroot/moodle/moodle/question/type/match/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.21.2.4 2007/04/19 17:37:26 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.21.2.5 2007/05/04 10:03:56 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/user/editlib.php,v 
< <?php  //$Id: editlib.php,v 1.4.2.1 2007/04/20 14:42:15 skodak Exp $ 
> <?php  //$Id: editlib.php,v 1.4.2.2 2007/04/29 13:50:10 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/user/profile/field/menu/field.class.php,v 
< <?php //$Id: field.class.php,v 1.10 2007/04/19 07:42:40 ikawhero Exp $ 
> <?php //$Id: field.class.php,v 1.7.2.3 2007/04/19 07:39:51 ikawhero Exp $

To generate this information yourself

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

cvs diff -r MOODLE_17_MERGED -r MOODLE_17_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.