Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Thu Aug 14 17:30:03 CEST 2008

None!

Files with MOODLE_18_MERGED tag not updated - Thu Aug 14 17:30:38 CEST 2008

RCS file: /cvsroot/moodle/mod/scorm/player.php
< <?PHP  // $Id: player.php,v 1.22.2.11 2008/08/07 20:48:33 danmarsden Exp $ 
> <?PHP  // $Id: player.php,v 1.22.2.12 2008/08/13 22:32:06 piers Exp $ 
 
RCS file: /cvsroot/moodle/mod/scorm/rd.js
 
RCS file: /cvsroot/moodle/mod/scorm/styles.php
 
RCS file: /cvsroot/moodle/mod/wiki/view.php
< <?php  // $Id: view.php,v 1.66.2.4 2008/05/13 01:51:07 stronk7 Exp $ 
> <?php  // $Id: view.php,v 1.66.2.5 2008/07/31 14:14:05 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php

Files with MOODLE_19_MERGED tag not updated - Fri Aug 15 00:36:58 CEST 2008

RCS file: /cvsroot/moodle/lib/accesslib.php
 
RCS file: /cvsroot/moodle/lib/ajax/ajaxlib.php
 
RCS file: /cvsroot/moodle/mod/quiz/report/overview/overviewsettings_form.php
< <?php  // $Id: overviewsettings_form.php,v 1.1.2.6 2008/06/07 12:58:34 jamiesensei Exp $ 
> <?php  // $Id: overviewsettings_form.php,v 1.1.2.7 2008/07/04 09:48:02 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/mod/quiz/report/overview/report.php
<  * @version $Id: report.php,v 1.98.2.41 2008/07/01 11:39:09 jamiesensei Exp $ 
>  * @version $Id: report.php,v 1.98.2.43 2008/07/20 13:01:45 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/mod/scorm/locallib.php
< <?php  // $Id: locallib.php,v 1.46.2.8 2008/08/03 22:17:16 piers Exp $ 
> <?php  // $Id: locallib.php,v 1.46.2.9 2008/08/13 22:28:03 piers Exp $ 
 
RCS file: /cvsroot/moodle/mod/scorm/player.php
< <?PHP  // $Id: player.php,v 1.34.2.6 2008/08/07 20:47:20 danmarsden Exp $ 
> <?PHP  // $Id: player.php,v 1.34.2.7 2008/08/13 22:28:03 piers Exp $ 
 
RCS file: /cvsroot/moodle/mod/scorm/rd.js
 
RCS file: /cvsroot/moodle/mod/wiki/view.php
< <?php  // $Id: view.php,v 1.76.2.3 2008/05/13 01:46:37 stronk7 Exp $ 
> <?php  // $Id: view.php,v 1.76.2.4 2008/07/31 14:02:34 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php

To generate this information yourself

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

cvs diff -r MOODLE_19_MERGED -r MOODLE_19_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.

• Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files.