Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Wed Apr 16 02:15:47 CEST 2008

none!

Files with MOODLE_19_MERGED tag not updated - Tue Apr 15 01:51:38 CEST 2008

RCS file: /cvsroot/moodle/blocks/search/block_search.php
 
RCS file: /cvsroot/moodle/blocks/search/config_global.html
 
RCS file: /cvsroot/moodle/lib/accesslib.php
 
RCS file: /cvsroot/moodle/mod/hotpot/attempt.php
< <?php // $Id: attempt.php,v 1.18.2.2 2008/03/06 07:34:02 gbateson Exp $ 
> <?php // $Id: attempt.php,v 1.18.2.3 2008/04/02 06:10:03 dongsheng Exp $ 
 
RCS file: /cvsroot/moodle/mod/hotpot/grade.php
 
RCS file: /cvsroot/moodle/mod/hotpot/report.php
< <?PHP  // $Id: report.php,v 1.38.2.8 2008/03/06 07:34:03 gbateson Exp $ 
> <?PHP  // $Id: report.php,v 1.38.2.9 2008/04/02 06:10:04 dongsheng Exp $ 
 
RCS file: /cvsroot/moodle/mod/hotpot/review.php
< <?PHP // $Id: review.php,v 1.17.2.3 2008/03/06 07:34:03 gbateson Exp $ 
> <?PHP // $Id: review.php,v 1.17.2.4 2008/04/02 06:10:04 dongsheng Exp $ 
 
RCS file: /cvsroot/moodle/mod/quiz/lib.php
< <?php  // $Id: lib.php,v 1.282.2.12 2008/02/21 12:21:44 nicolasconnault Exp $ 
> <?php  // $Id: lib.php,v 1.282.2.13 2008/03/19 12:21:54 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/search/LISEZMOI.txt
 
RCS file: /cvsroot/moodle/search/READMETOO.txt
 
RCS file: /cvsroot/moodle/search/add.php
 
RCS file: /cvsroot/moodle/search/cron_php5.php
 
RCS file: /cvsroot/moodle/search/delete.php
 
RCS file: /cvsroot/moodle/search/index.php
 
RCS file: /cvsroot/moodle/search/indexer.php
 
RCS file: /cvsroot/moodle/search/indexersplash.php
 
RCS file: /cvsroot/moodle/search/indexlib.php
 
RCS file: /cvsroot/moodle/search/lib.php
 
RCS file: /cvsroot/moodle/search/query.php
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/stats.php
 
RCS file: /cvsroot/moodle/search/update.php
 
RCS file: /cvsroot/moodle/search/documents/chat_document.php
 
RCS file: /cvsroot/moodle/search/documents/data_document.php
 
RCS file: /cvsroot/moodle/search/documents/document.php
 
RCS file: /cvsroot/moodle/search/documents/forum_document.php
 
RCS file: /cvsroot/moodle/search/documents/glossary_document.php
 
RCS file: /cvsroot/moodle/search/documents/lesson_document.php
 
RCS file: /cvsroot/moodle/search/documents/physical_doc.php
 
RCS file: /cvsroot/moodle/search/documents/physical_htm.php
 
RCS file: /cvsroot/moodle/search/documents/physical_html.php
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/physical_ppt.php
 
RCS file: /cvsroot/moodle/search/documents/physical_txt.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php
 
RCS file: /cvsroot/moodle/search/documents/resource_document.php
 
RCS file: /cvsroot/moodle/search/documents/techproject_document.php
 
RCS file: /cvsroot/moodle/search/documents/wiki_document.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.