Development:Unmerged files

Files with MOODLE_15_MERGED tag not updated - Wed Nov 1 19:33:52 CET 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/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/db/mysql.php,v 
< <?php // $Id: mysql.php,v 1.29 2006/04/24 09:10:36 vyshane 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.40 2006/05/17 06:42:57 martinlanghoff 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 - Wed Nov 1 19:38:24 CET 2006

RCS file: /cvsroot/moodle/moodle/admin/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/grade/index.php,v 
 
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/mod/hotpot/hotpot-full.js,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/index.php,v 
< <?PHP // $Id: index.php,v 1.5 2005/11/08 07:48:10 gbateson Exp $ 
> <?PHP // $Id: index.php,v 1.5.4.3 2006/10/02 00:30:32 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.47.2.2 2006/09/13 08:17:50 gbateson Exp $ 
> <?PHP  // $Id: lib.php,v 1.47.2.4 2006/10/01 06:22:12 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/mod.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report.php,v 
< <?PHP  // $Id: report.php,v 1.8.2.1 2006/08/10 15:30:56 skodak Exp $ 
> <?PHP  // $Id: report.php,v 1.8.2.8 2006/10/11 01:41:26 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.11.2.3 2006/09/01 03:58:09 gbateson Exp $ 
> <?PHP //$Id: restorelib.php,v 1.11.2.4 2006/10/05 07:12:15 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/show.php,v 
< <?php // $Id: show.php,v 1.9 2006/03/07 21:46:30 skodak Exp $ 
> <?php // $Id: show.php,v 1.9.2.1 2006/09/28 12:41:49 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/mysql.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/template/v6.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/mod/scorm/backuplib.php,v 
< <?php //$Id: backuplib.php,v 1.15 2006/04/12 06:06:31 bobopinna Exp $ 
> <?php //$Id: backuplib.php,v 1.15.2.1 2006/10/31 11:38:58 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.22 2006/04/12 06:08:08 bobopinna Exp $ 
> <?php //$Id: restorelib.php,v 1.22.2.1 2006/10/31 11:38:59 bobopinna 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.