Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Tue Aug 7 00:53:16 CEST 2007

RCS file: /cvsroot/moodle/moodle/lang/en_utf8/scorm.php
< <?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/accesslib.php 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php
< <?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/player.php
< <?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/datamodels/scorm_12lib.php
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css

Files with MOODLE_18_MERGED tag not updated - Tue Aug 7 01:08:52 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/mnet/index.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/README-CAS
 
RCS file: /cvsroot/moodle/moodle/auth/cas/auth.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/cas_form.html
 
RCS file: /cvsroot/moodle/moodle/auth/cas/config.html
 
RCS file: /cvsroot/moodle/moodle/auth/cas/languages.php
< // version $Id: languages.php,v 1.2.20.1 2007/04/29 13:57:58 skodak Exp $
> // 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
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/client.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/domxml-php4-php5.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-db.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-file.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-main.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/english.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/french.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/german.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/greek.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/japanese.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/languages.php
 
RCS file: /cvsroot/moodle/moodle/course/report/log/index.php
< <?php // $Id: index.php,v 1.13.2.1 2007/02/28 05:36:26 nicolasconnault Exp $ 
> <?php // $Id: index.php,v 1.13.2.2 2007/08/03 13:18:00 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/course/report/log/lib.php
< <?php  // $Id: lib.php,v 1.18.2.2 2007/03/15 16:02:32 poltawski Exp $ 
> <?php  // $Id: lib.php,v 1.18.2.3 2007/08/03 13:18:01 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/role.php
< <?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
< <?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/assignment/allowdeleting.html
 
RCS file: /cvsroot/moodle/moodle/lib/editor/htmlarea/htmlarea.php
< // $Id: htmlarea.php,v 1.16 2007/01/27 23:23:45 skodak Exp $ 
> // $Id: htmlarea.php,v 1.16.2.1 2007/08/06 05:21:30 mattc-catalyst Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/lib.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/preview.php
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/mod_form.php
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php
< <?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
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php
< <?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
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php
< <?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
< <?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/question/format/blackboard_6/format.php
 
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css
 
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_layout.css
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_ie6.css
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_ie7.css

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.