Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Tue Nov 18 00:28:42 CET 2008

none!

Files with MOODLE_18_MERGED tag not updated - Mon Nov 10 10:31:02 CET 2008

RCS file: /cvsroot/moodle/lang/en_utf8/qtype_calculated.php
 
RCS file: /cvsroot/moodle/mnet/remote_client.php
 
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 - Mon Nov 10 10:31:20 CET 2008

RCS file: /cvsroot/moodle/admin/uploaduser.php
< <?php  // $Id: uploaduser.php,v 1.68.2.13 2008/09/26 09:10:20 scyrma Exp $ 
> <?php  // $Id: uploaduser.php,v 1.68.2.14 2008/10/18 00:10:00 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/grade/edit/outcome/edit_form.php
< <?php  //$Id: edit_form.php,v 1.5.2.2 2008/03/03 10:21:42 nicolasconnault Exp $ 
> <?php  //$Id: edit_form.php,v 1.5.2.3 2008/10/22 09:09:32 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/grade/edit/tree/outcomeitem_form.php
< <?php  //$Id: outcomeitem_form.php,v 1.12.2.13 2008/10/17 14:01:07 nicolasconnault Exp $ 
> <?php  //$Id: outcomeitem_form.php,v 1.12.2.14 2008/10/22 09:09:32 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lang/en_utf8/grades.php
< <?PHP // $Id: grades.php,v 1.111.2.58 2008/10/17 14:32:44 nicolasconnault Exp $ 
> <?PHP // $Id: grades.php,v 1.111.2.59 2008/10/22 09:09:32 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lib/formslib.php
< <?php // $Id: formslib.php,v 1.129.2.17 2008/10/13 19:38:49 skodak Exp $ 
> <?php // $Id: formslib.php,v 1.129.2.18 2008/10/22 09:09:31 nicolasconnault Exp $ 
<  * @version $Id: formslib.php,v 1.129.2.17 2008/10/13 19:38:49 skodak Exp $ 
>  * @version $Id: formslib.php,v 1.129.2.18 2008/10/22 09:09:31 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lib/weblib.php
< <?php // $Id: weblib.php,v 1.970.2.113 2008/10/07 02:09:51 jerome Exp $ 
> <?php // $Id: weblib.php,v 1.970.2.114 2008/10/20 17:47:52 arborrow Exp $ 
<  * @version  $Id: weblib.php,v 1.970.2.113 2008/10/07 02:09:51 jerome Exp $ 
>  * @version  $Id: weblib.php,v 1.970.2.114 2008/10/20 17:47:52 arborrow Exp $

To generate this information yourself

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

cvs diff -kkv -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.