Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Sun Aug 12 12:37:12 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

Files with MOODLE_18_MERGED tag not updated - Thu Aug 23 17:41:43 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/environment.xml
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php
< <?PHP // $Id: admin.php,v 1.103.2.13 2007/06/19 16:32:07 jamiesensei Exp $ 
> <?PHP // $Id: admin.php,v 1.103.2.15 2007/08/22 05:56:10 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/question.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/courseformats.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/directorypaths.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/html.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/index.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/install.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/markdown.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/questions.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/reading.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/richtext.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/scales.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/surveys.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/text.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/textformat.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/writing.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/enrol/authorize/captureday.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/enrol/authorize/orderreview.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/enrol/authorize/review.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/enrol/imsenterprise/unenrol.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/forum/ratings.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/glossary/displayformat.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/glossary/index.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/hotpot/responsestable.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/lesson/dependency.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/lesson/import.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/lesson/mediafile.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/lesson/minquestions.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/quiz/export.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/quiz/import.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/quiz/questiontypes.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/deploy.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/window.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/type/directory.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/type/file.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/type/html.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/type/ims.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/type/label.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/resource/type/text.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/scorm/window.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/wiki/howtowiki.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/wiki/wikitype.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/wiki/wikiusage.html
 
RCS file: /cvsroot/moodle/moodle/lib/environmentlib.php
< <?php  //$Id: environmentlib.php,v 1.20.2.2 2007/06/19 16:32:07 jamiesensei Exp $ 
> <?php  //$Id: environmentlib.php,v 1.20.2.3 2007/08/22 05:29:35 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/filelib.php
< <?php //$Id: filelib.php,v 1.39.2.4 2007/08/17 04:57:08 toyomoyo Exp $ 
> <?php //$Id: filelib.php,v 1.39.2.6 2007/08/23 06:42:24 moodler Exp $ 
 
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/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php
< <?php  // $Id: lib.php,v 1.536.2.36 2007/08/13 05:38:14 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.536.2.37 2007/08/23 13:38:21 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/lib.php
< <?php  // $Id: lib.php,v 1.261.2.5 2007/08/13 11:20:59 tjhunt Exp $ 
> <?php  // $Id: lib.php,v 1.261.2.6 2007/08/14 13:33:44 tjhunt Exp $ 
< * @version $Id: lib.php,v 1.261.2.5 2007/08/13 11:20:59 tjhunt Exp $ 
> * @version $Id: lib.php,v 1.261.2.6 2007/08/14 13:33:44 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/mod_form.php
 
RCS file: /cvsroot/moodle/moodle/pix/f/odt.gif

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.

• Tracker Task [https://tracker.moodle.org/browse/MDL-8912 MDL-8912]: Progress in the Moodle Tracker about these unmerged files.