Development:Unmerged files

Files with MOODLE_15_MERGED tag not updated - Mon Sep 4 21:50:58 CEST 2006

RCS file: /cvsroot/moodle/moodle/lang/en/docs/Attic/release.html,v 
< $Id: release.html,v 1.83.2.18 2006/02/06 09:59:38 moodler Exp $
> $Id: release.html,v 1.83.2.20 2006/05/21 07:59:15 moodler Exp $
 
RCS file: /cvsroot/moodle/moodle/lib/editor/Attic/htmlarea.php,v 
< // $Id: htmlarea.php,v 1.60.2.9 2006/01/25 23:41:11 julmis Exp $ 
> // $Id: htmlarea.php,v 1.60.2.10 2006/05/14 09:22:24 urs_hunkler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/README.TXT,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.6.2.6 2006/05/02 05:57:13 moodler Exp $ 
> <?PHP  // $Id: lib.php,v 1.6.2.7 2006/08/31 21:36:32 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report.php,v 
< <?PHP  // $Id: report.php,v 1.1.2.2 2006/08/10 15:51:48 skodak Exp $ 
> <?PHP  // $Id: report.php,v 1.1.2.3 2006/08/29 06:34:23 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/version.php,v 
< <?PHP // $Id: version.php,v 1.5.2.3 2006/08/10 15:51:48 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.5.2.4 2006/08/29 08:26:24 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/fullstat/report.php,v 
< <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 
> <?php  // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/overview/report.php,v 
< <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 
> <?php  // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/simplestat/report.php,v 
< <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 
> <?php  // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/mod.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm1_3.js.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/mysql.php,v 
< <?php // $Id: mysql.php,v 1.19.2.1 2005/06/28 06:57:57 bobopinna Exp $ 
> <?php // $Id: mysql.php,v 1.19.2.2 2006/06/05 08:11:29 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/mysql.sql,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/postgres7.php,v 
< <?php // $Id: postgres7.php,v 1.28.2.1 2005/08/15 22:30:46 patrickslee Exp $ 
> <?php // $Id: postgres7.php,v 1.28.2.2 2006/06/05 08:11:29 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/postgres7.sql,v

Files with MOODLE_16_MERGED tag not updated - Tue Aug 29 01:00:54 CEST 2006

RCS file: /cvsroot/moodle/moodle/lang/en_utf8/forum.php,v 
< <?PHP // $Id: forum.php,v 1.2.2.2 2006/07/31 04:54:06 martinlanghoff Exp $  
> <?PHP // $Id: forum.php,v 1.2.2.3 2006/07/31 05:56:48 martinlanghoff Exp $  
 
RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v 
< <?php // $Id: discuss.php,v 1.65.2.5 2006/07/31 04:54:07 martinlanghoff Exp $ 
> <?php // $Id: discuss.php,v 1.65.2.6 2006/07/31 05:56:48 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/import.php,v 
< <?PHP // $Id: import.php,v 1.18.2.1 2006/08/10 15:30:57 skodak Exp $ 
> <?PHP // $Id: import.php,v 1.18.2.2 2006/08/28 20:01:13 mark-nielsen Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/locallib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/insertpage.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/updatepage.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/db/postgres7.php,v 
< <?php // $Id: postgres7.php,v 1.93.2.5 2006/07/18 10:58:40 tjhunt Exp $ 
> <?php // $Id: postgres7.php,v 1.93.2.6 2006/07/31 05:38:21 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/shortanswer/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.2 2006/04/30 15:11:13 gustav_delius Exp $ 
> <?php  // $Id: questiontype.php,v 1.2.2.1 2006/08/23 18:53:40 tjhunt Exp $

To generate this information yourself

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

cvs diff -r MOODLE_16_MERGED -r MOODLE_16_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.