Development:Unmerged files

Files with MOODLE_16_MERGED tag not updated - Sun Mar 11 14:17:26 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/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/backuplib.php,v 
< <?php //$Id: backuplib.php,v 1.4.2.1 2006/12/05 18:13:56 tjhunt Exp $ 
> <?php //$Id: backuplib.php,v 1.4.2.2 2007/03/02 04:48:21 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.13.2.3 2006/08/18 21:21:59 tjhunt Exp $ 
> <?php //$Id: restorelib.php,v 1.13.2.4 2007/03/02 04:48:21 moodler 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 - Sun Mar 11 14:22:56 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/oacleanup.php,v 
< <?php // $Id: oacleanup.php,v 1.6 2006/09/25 20:22:56 skodak Exp $ 
> <?php // $Id: oacleanup.php,v 1.6.2.1 2007/02/28 00:07:22 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/admin/roles/assign.html,v 
 
RCS file: /cvsroot/moodle/moodle/admin/roles/assign.php,v 
< <?php // $Id: assign.php,v 1.33.2.4 2007/02/09 03:08:17 toyomoyo Exp $ 
> <?php // $Id: assign.php,v 1.33.2.5 2007/03/08 05:25:42 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/admin/roles/manage.php,v 
< <?php //$Id: manage.php,v 1.32.2.5 2006/11/20 17:40:45 skodak Exp $ 
> <?php //$Id: manage.php,v 1.32.2.6 2007/02/16 02:39:28 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/restorelib.php,v 
 
RCS file: /cvsroot/moodle/moodle/blocks/moodleblock.class.php,v 
< <?php  // $Id: moodleblock.class.php,v 1.73.2.2 2006/11/15 03:34:09 vyshane Exp $ 
> <?php  // $Id: moodleblock.class.php,v 1.73.2.3 2007/02/16 01:24:30 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/calendar/lib.php,v 
< <?php // $Id: lib.php,v 1.151.2.6 2007/02/27 14:30:33 defacer Exp $ 
> <?php // $Id: lib.php,v 1.151.2.7 2007/03/06 01:37:54 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/course/import/groups/index.php,v 
 
RCS file: /cvsroot/moodle/moodle/course/report/stats/graph.php,v 
< <?php  //$Id: graph.php,v 1.9 2006/09/24 07:13:33 mjollnir_ Exp $ 
> <?php  //$Id: graph.php,v 1.9.2.1 2007/02/28 00:32:16 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/filter/mediaplugin/filter.php,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.4.2.1 2006/11/01 09:37:07 moodler Exp $  
> <?PHP // $Id: currencies.php,v 1.4.2.2 2007/02/17 23:37:03 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lib/statslib.php,v 
 
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v 
< <?PHP  //$Id: upgrade.php,v 1.3.2.4 2007/01/26 19:25:53 stronk7 Exp $ 
> <?PHP  //$Id: upgrade.php,v 1.3.2.5 2007/02/28 00:25:46 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/user.php,v 
 
RCS file: /cvsroot/moodle/moodle/question/backuplib.php,v 
< <?php //$Id: backuplib.php,v 1.7.2.1 2006/12/05 18:14:32 tjhunt Exp $ 
> <?php //$Id: backuplib.php,v 1.7.2.3 2007/03/02 05:20:39 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.21 2006/09/19 13:35:42 tjhunt Exp $ 
> <?php //$Id: restorelib.php,v 1.21.2.3 2007/03/02 08:01:47 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/user/view.php,v 
< <?PHP // $Id: view.php,v 1.123.2.6 2007/02/13 08:30:25 moodler Exp $ 
> <?PHP // $Id: view.php,v 1.123.2.7 2007/03/07 06:25:37 moodler Exp $

Files with MOODLE_18_MERGED tag not updated - Sun Mar 11 14:29:49 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/cron.php,v 
< <?PHP // $Id: cron.php,v 1.98.2.3 2007/02/20 17:13:36 skodak Exp $ 
> <?PHP // $Id: cron.php,v 1.98.2.4 2007/03/07 04:54:57 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/footer.php,v 
 
RCS file: /cvsroot/moodle/moodle/calendar/lib.php,v 
< <?php // $Id: lib.php,v 1.164.2.4 2007/02/27 14:35:28 defacer Exp $ 
> <?php // $Id: lib.php,v 1.164.2.5 2007/03/01 05:09:41 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/course/category.php,v 
< <?php // $Id: category.php,v 1.93.2.2 2007/02/28 05:36:13 nicolasconnault Exp $ 
> <?php // $Id: category.php,v 1.93.2.3 2007/03/01 14:47:09 poltawski Exp $ 
 
RCS file: /cvsroot/moodle/moodle/course/info.php,v 
< <?php // $Id: info.php,v 1.13.2.2 2007/03/05 05:35:41 moodler Exp $ 
> <?php // $Id: info.php,v 1.13.2.3 2007/03/05 05:38:46 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/group/db/upgrade.php,v 
< <?php  //$Id: upgrade.php,v 1.11.2.1 2007/02/28 13:39:11 nfreear Exp $ 
> <?php  //$Id: upgrade.php,v 1.11.2.2 2007/03/09 14:33:43 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/block_course_list.php,v 
< <?PHP // $Id: block_course_list.php,v 1.2 2006/11/01 09:44:02 moodler Exp $  
> <?PHP // $Id: block_course_list.php,v 1.2.4.1 2007/02/26 15:13:05 andreabix Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.5 2006/11/01 09:44:04 moodler Exp $  
> <?PHP // $Id: currencies.php,v 1.5.4.1 2007/02/17 23:37:51 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/lib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/hotpot-full.js,v 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/config.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/ims.html,v 
< <?php // $Id: ims.html,v 1.8 2007/03/02 01:19:00 toyomoyo Exp $ 
> <?php // $Id: ims.html,v 1.7.2.1 2007/03/02 01:18:49 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/locallib.php,v 
< <?php  // $Id: locallib.php,v 1.34 2007/01/25 13:49:50 bobopinna Exp $ 
> <?php  // $Id: locallib.php,v 1.34.2.2 2007/03/08 12:42:58 csantossaenz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php,v 
< <?PHP  // $Id: player.php,v 1.22.2.1 2007/02/28 05:36:24 nicolasconnault Exp $ 
> <?PHP  // $Id: player.php,v 1.22.2.3 2007/03/08 12:42:58 csantossaenz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/lib.php,v 
< <?php  // $Id: lib.php,v 1.49 2007/02/22 17:46:27 sam_marshall Exp $ 
> <?php  // $Id: lib.php,v 1.48.2.1 2007/02/22 17:46:13 sam_marshall Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/view.php,v 
< <?php  // $Id: view.php,v 1.69 2007/03/02 01:29:28 toyomoyo Exp $ 
> <?php  // $Id: view.php,v 1.66.2.3 2007/03/02 01:29:10 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/datasetdependent/datasetitems_form.php,v 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/edit_multianswer_form.php,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/left.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/left_active.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/left_active_hover.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/left_hover.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/right.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/right_active.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/right_active_hover.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/pix/tab/right_hover.gif,v

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.