Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Tue Nov 6 00:14:09 CET 2007

RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php

Files with MOODLE_18_MERGED tag not updated - Tue Nov 6 00:14:19 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/blocks.php
 
RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php
< <?php // $Id: auth.php,v 1.14.2.13 2007/10/11 13:19:53 nicolasconnault Exp $ 
> <?php // $Id: auth.php,v 1.14.2.15 2007/11/01 06:13:19 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blocks/loancalc/block_loancalc.php
< <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $ 
> <?php // $Id: block_loancalc.php,v 1.9.2.1 2007/10/22 20:29:45 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/enrol.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js
 
RCS file: /cvsroot/moodle/moodle/mnet/testclient.php
> <?php // $Id: testclient.php,v 1.1.2.2 2007/10/19 00:45:56 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php

Files with MOODLE_19_MERGED tag not updated - Tue Nov 6 00:14:31 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php
 
RCS file: /cvsroot/moodle/moodle/blocks/loancalc/block_loancalc.php
< <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $ 
> <?php // $Id: block_loancalc.php,v 1.9.4.1 2007/10/22 20:37:53 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/moodle/enrol/imsenterprise/enrol.php
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/enrol.php
 
RCS file: /cvsroot/moodle/moodle/group/autogroup.php
< <?php // $Id: autogroup.php,v 1.1 2007/09/24 21:55:15 mattc-catalyst Exp $ 
> <?php // $Id: autogroup.php,v 1.1.2.1 2007/10/18 03:00:23 mattc-catalyst Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/glossary.php
< <?PHP // $Id: glossary.php,v 1.9 2007/11/01 14:51:29 nicolasconnault Exp $ 
> <?PHP // $Id: glossary.php,v 1.8 2007/09/24 17:09:37 nfreear Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/group.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/surveys.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/uploadusers2.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/question/permissions.html
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js
 
RCS file: /cvsroot/moodle/moodle/lib/questionlib.php
< <?php  // $Id: questionlib.php,v 1.119.2.1 2007/10/30 19:28:07 tjhunt Exp $ 
> <?php  // $Id: questionlib.php,v 1.119.2.2 2007/11/02 16:20:32 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/testclient.php
< <?php // $Id: testclient.php,v 1.2 2007/08/29 10:48:47 stronk7 Exp $ 
> <?php // $Id: testclient.php,v 1.2.2.2 2007/10/19 00:44:40 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/attempt.php
< <?php  // $Id: attempt.php,v 1.131.2.2 2007/10/16 20:52:12 tjhunt Exp $ 
> <?php  // $Id: attempt.php,v 1.131.2.3 2007/11/02 16:20:06 tjhunt Exp $ 
< * @version $Id: attempt.php,v 1.131.2.2 2007/10/16 20:52:12 tjhunt Exp $ 
> * @version $Id: attempt.php,v 1.131.2.3 2007/11/02 16:20:06 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/backuplib.php
< <?php //$Id: backuplib.php,v 1.62 2007/09/29 16:26:13 skodak Exp $ 
> <?php // $Id: backuplib.php,v 1.62.2.1 2007/11/02 16:20:00 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/comment.php
< <?php  // $Id: comment.php,v 1.6 2007/08/17 12:49:38 skodak Exp $ 
> <?php  // $Id: comment.php,v 1.6.2.1 2007/11/02 16:19:56 tjhunt Exp $ 
< * @version $Id: comment.php,v 1.6 2007/08/17 12:49:38 skodak Exp $ 
> * @version $Id: comment.php,v 1.6.2.1 2007/11/02 16:19:56 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/config.html
< <?php  // $Id: config.html,v 1.32 2007/08/06 13:22:59 tjhunt Exp $ 
> <?php  // $Id: config.html,v 1.32.2.1 2007/11/02 16:19:57 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/defaults.php
< <?php // $Id: defaults.php,v 1.14 2006/08/11 14:59:21 tjhunt Exp $ 
> <?php // $Id: defaults.php,v 1.14.12.1 2007/11/02 16:19:58 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/edit.php
< <?php // $Id: edit.php,v 1.107.2.2 2007/10/30 19:28:06 tjhunt Exp $ 
> <?php // $Id: edit.php,v 1.107.2.3 2007/11/02 16:20:00 tjhunt Exp $ 
< * @version $Id: edit.php,v 1.107.2.2 2007/10/30 19:28:06 tjhunt Exp $ 
> * @version $Id: edit.php,v 1.107.2.3 2007/11/02 16:20:00 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/editlib.php
< <?php // $Id: editlib.php,v 1.54 2007/08/09 21:52:34 jamiesensei Exp $ 
> <?php // $Id: editlib.php,v 1.54.2.1 2007/11/02 16:20:00 tjhunt Exp $ 
< * @version $Id: editlib.php,v 1.54 2007/08/09 21:52:34 jamiesensei Exp $ 
> * @version $Id: editlib.php,v 1.54.2.1 2007/11/02 16:20:00 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/grade.php
< <?php  // $Id: grade.php,v 1.1 2007/08/06 05:38:58 moodler Exp $ 
> <?php  // $Id: grade.php,v 1.1.2.1 2007/11/02 16:19:56 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/index.php
< <?php // $Id: index.php,v 1.46.2.3 2007/10/31 16:42:06 tjhunt Exp $ 
> <?php // $Id: index.php,v 1.46.2.4 2007/11/02 16:20:04 tjhunt Exp $ 
< * @version $Id: index.php,v 1.46.2.3 2007/10/31 16:42:06 tjhunt Exp $ 
> * @version $Id: index.php,v 1.46.2.4 2007/11/02 16:20:04 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/jstimer.php
< <?php // $Id: jstimer.php,v 1.16 2007/09/26 18:15:32 tjhunt Exp $ 
> <?php // $Id: jstimer.php,v 1.16.2.1 2007/11/02 16:19:56 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/lib.php
< <?php  // $Id: lib.php,v 1.282.2.2 2007/11/01 08:50:34 skodak Exp $ 
> <?php  // $Id: lib.php,v 1.282.2.3 2007/11/02 16:20:01 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/locallib.php
< <?php  // $Id: locallib.php,v 1.127.2.1 2007/10/31 17:08:52 tjhunt Exp $ 
> <?php  // $Id: locallib.php,v 1.127.2.2 2007/11/02 16:19:55 tjhunt Exp $ 
<  * @version $Id: locallib.php,v 1.127.2.1 2007/10/31 17:08:52 tjhunt Exp $ 
>  * @version $Id: locallib.php,v 1.127.2.2 2007/11/02 16:19:55 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/mod_form.php
< <?php // $Id: mod_form.php,v 1.28.2.1 2007/10/31 17:08:52 tjhunt Exp $ 
> <?php // $Id: mod_form.php,v 1.28.2.2 2007/11/02 16:19:56 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/pagelib.php
< <?php // $Id: pagelib.php,v 1.14 2007/04/16 21:23:17 mattc-catalyst Exp $ 
> <?php // $Id: pagelib.php,v 1.14.4.1 2007/11/02 16:19:58 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/quizfile.php
< <?PHP // $Id: quizfile.php,v 1.16 2006/09/23 09:38:40 skodak Exp $ 
> <?PHP // $Id: quizfile.php,v 1.16.10.1 2007/11/02 16:20:00 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report.php
< <?php  // $Id: report.php,v 1.45 2007/08/17 12:49:38 skodak Exp $ 
> <?php  // $Id: report.php,v 1.45.2.1 2007/11/02 16:19:59 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/restorelib.php
< <?php //$Id: restorelib.php,v 1.90 2006/12/11 17:12:04 tjhunt Exp $ 
> <?php // $Id: restorelib.php,v 1.90.6.1 2007/11/02 16:19:59 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/restorelibpre15.php
< <?php //$Id: restorelibpre15.php,v 1.26 2006/10/17 10:05:41 thompson697 Exp $ 
> <?php // $Id: restorelibpre15.php,v 1.26.8.1 2007/11/02 16:19:57 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/review.php
< <?php  // $Id: review.php,v 1.59.2.1 2007/10/12 16:09:45 tjhunt Exp $ 
> <?php  // $Id: review.php,v 1.59.2.2 2007/11/02 16:20:05 tjhunt Exp $ 
< * @version $Id: review.php,v 1.59.2.1 2007/10/12 16:09:45 tjhunt Exp $ 
> * @version $Id: review.php,v 1.59.2.2 2007/11/02 16:20:05 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/reviewquestion.php
< <?php  // $Id: reviewquestion.php,v 1.16 2006/08/25 16:03:57 tjhunt Exp $ 
> <?php  // $Id: reviewquestion.php,v 1.16.10.1 2007/11/02 16:19:57 tjhunt Exp $ 
< * @version $Id: reviewquestion.php,v 1.16 2006/08/25 16:03:57 tjhunt Exp $ 
> * @version $Id: reviewquestion.php,v 1.16.10.1 2007/11/02 16:19:57 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/tabs.php
< <?php  // $Id: tabs.php,v 1.21.2.1 2007/10/23 16:15:31 tjhunt Exp $ 
> <?php  // $Id: tabs.php,v 1.21.2.2 2007/11/02 16:19:55 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/version.php
< <?php // $Id: version.php,v 1.128 2007/10/10 16:09:35 skodak Exp $ 
> <?php // $Id: version.php,v 1.128.2.1 2007/11/02 16:19:54 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/view.php
< <?php  // $Id: view.php,v 1.124.2.5 2007/10/31 17:08:51 tjhunt Exp $ 
> <?php  // $Id: view.php,v 1.124.2.6 2007/11/02 16:20:04 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/db/mysql.php
< <?php // $Id: mysql.php,v 1.115 2007/04/12 15:34:47 stronk7 Exp $ 
> <?php // $Id: mysql.php,v 1.115.4.1 2007/11/02 16:20:25 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/db/postgres7.php
< <?php // $Id: postgres7.php,v 1.110 2007/04/12 15:34:47 stronk7 Exp $ 
> <?php // $Id: postgres7.php,v 1.110.4.1 2007/11/02 16:20:25 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.8 2007/08/09 21:52:36 jamiesensei Exp $ 
> <?php  // $Id: upgrade.php,v 1.8.2.1 2007/11/02 16:20:26 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/default.php
< <?php  // $Id: default.php,v 1.11.2.1 2007/10/12 16:09:37 tjhunt Exp $  
> <?php  // $Id: default.php,v 1.11.2.2 2007/11/02 16:20:41 tjhunt Exp $  
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/analysis/report.php
< <?php  // $Id: report.php,v 1.41.2.1 2007/10/16 21:26:03 tjhunt Exp $ 
> <?php  // $Id: report.php,v 1.41.2.2 2007/11/02 16:21:00 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/grading/report.php
< <?php  // $Id: report.php,v 1.25 2007/09/19 15:52:27 tjhunt Exp $ 
> <?php  // $Id: report.php,v 1.25.2.1 2007/11/02 16:20:53 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/overview/report.php
<  * @version $Id: report.php,v 1.98.2.1 2007/10/30 19:28:06 tjhunt Exp $ 
>  * @version $Id: report.php,v 1.98.2.2 2007/11/02 16:20:36 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/regrade/report.php
< <?php  // $Id: report.php,v 1.19 2007/09/17 16:17:25 tjhunt Exp $ 
> <?php  // $Id: report.php,v 1.19.2.1 2007/11/02 16:20:37 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/backuplib.php
< <?php //$Id: backuplib.php,v 1.13 2007/09/29 16:18:01 skodak Exp $ 
> <?php // $Id: backuplib.php,v 1.13.2.1 2007/11/02 16:20:13 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/category.php
< <?php // $Id: category.php,v 1.24 2007/08/15 11:36:02 jamiesensei Exp $ 
> <?php // $Id: category.php,v 1.24.2.1 2007/11/02 16:20:24 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/category_class.php
< <?php // $Id: category_class.php,v 1.32 2007/09/26 16:10:38 tjhunt Exp $ 
> <?php // $Id: category_class.php,v 1.32.2.1 2007/11/02 16:20:11 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/category_form.php
< <?php  //$Id$ 
> <?php  // $Id$ 
 
RCS file: /cvsroot/moodle/moodle/question/contextmove_form.php
< <?php  //$Id$ 
> <?php  // $Id$ 
 
RCS file: /cvsroot/moodle/moodle/question/contextmoveq_form.php
< <?php  //$Id$ 
> <?php  // $Id$ 
 
RCS file: /cvsroot/moodle/moodle/question/edit.php
< <?php // $Id: edit.php,v 1.21 2007/08/15 11:36:08 jamiesensei Exp $ 
> <?php // $Id: edit.php,v 1.21.2.1 2007/11/02 16:20:22 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/editlib.php
< <?php // $Id: editlib.php,v 1.76 2007/10/03 04:42:57 jamiesensei Exp $ 
> <?php // $Id: editlib.php,v 1.76.2.1 2007/11/02 16:20:19 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/export.php
< <?php // $Id: export.php,v 1.43 2007/10/09 21:43:30 iarenaza Exp $ 
> <?php // $Id: export.php,v 1.43.2.1 2007/11/02 16:20:19 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/export_form.php
< <?php  //$Id$ 
> <?php  // $Id$ 
 
RCS file: /cvsroot/moodle/moodle/question/format.php
< <?php  // $Id: format.php,v 1.35 2007/09/17 11:01:53 thepurpleblob Exp $ 
> <?php  // $Id: format.php,v 1.35.2.1 2007/11/02 16:20:23 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/import.php
< <?php // $Id: import.php,v 1.46 2007/08/15 11:36:10 jamiesensei Exp $ 
> <?php // $Id: import.php,v 1.46.2.1 2007/11/02 16:20:12 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/import_form.php
< <?php  //$Id$ 
> <?php  // $Id$ 
 
RCS file: /cvsroot/moodle/moodle/question/move_form.php
< <?php  //$Id$ 
> <?php  // $Id$ 
 
RCS file: /cvsroot/moodle/moodle/question/preview.php
< <?php // $Id: preview.php,v 1.23 2007/09/04 05:44:14 jamiesensei Exp $ 
> <?php // $Id: preview.php,v 1.23.2.1 2007/11/02 16:20:11 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/question.php
< <?php // $Id: question.php,v 1.49 2007/09/27 08:17:09 jamiesensei Exp $ 
> <?php // $Id: question.php,v 1.49.2.1 2007/11/02 16:20:23 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/restorelib.php
< <?php //$Id: restorelib.php,v 1.30 2007/09/20 15:57:03 tjhunt Exp $ 
> <?php // $Id: restorelib.php,v 1.30.2.1 2007/11/02 16:20:21 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/tabs.php
< <?php  // $Id: tabs.php,v 1.7 2007/08/20 03:36:07 jamiesensei Exp $ 
> <?php  // $Id: tabs.php,v 1.7.2.1 2007/11/02 16:20:20 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/aiken/format.php
< <?php  // $Id: format.php,v 1.6 2007/07/11 09:18:32 thepurpleblob Exp $  
> <?php  // $Id: format.php,v 1.6.2.1 2007/11/02 16:20:47 tjhunt Exp $  
 
RCS file: /cvsroot/moodle/moodle/question/format/blackboard/format.php
< <?php // $Id: format.php,v 1.12 2007/04/24 23:26:48 tjhunt Exp $ 
> <?php // $Id: format.php,v 1.12.4.1 2007/11/02 16:20:29 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php
< <?php  // $Id: format.php,v 1.13.2.1 2007/10/15 05:42:21 nicolasconnault Exp $ 
> <?php  // $Id: format.php,v 1.13.2.2 2007/11/02 16:20:38 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/examview/format.php
< <?php // $Id: format.php,v 1.10 2007/04/25 09:43:37 thepurpleblob Exp $ 
> <?php // $Id: format.php,v 1.10.4.1 2007/11/02 16:21:08 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/gift/format.php
< <?php // $Id: format.php,v 1.24.2.2 2007/10/25 09:43:09 tjhunt Exp $ 
> <?php // $Id: format.php,v 1.24.2.3 2007/11/02 16:20:33 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/hotpot/format.php
< <?PHP // $Id: format.php,v 1.12.4.1 2007/10/15 00:59:03 gbateson Exp $ 
> <?PHP // $Id: format.php,v 1.12.4.2 2007/11/02 16:20:38 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/learnwise/format.php
< <?php    // $Id: format.php,v 1.4 2007/03/20 02:23:12 pichetp Exp $  
> <?php    // $Id: format.php,v 1.4.4.1 2007/11/02 16:21:06 tjhunt Exp $  
 
RCS file: /cvsroot/moodle/moodle/question/format/missingword/format.php
< <?php  // $Id: format.php,v 1.3 2007/03/20 02:24:15 pichetp Exp $  
> <?php  // $Id: format.php,v 1.3.4.1 2007/11/02 16:21:07 tjhunt Exp $  
 
RCS file: /cvsroot/moodle/moodle/question/format/multianswer/format.php
< <?php  // $Id: format.php,v 1.4 2007/03/20 02:25:16 pichetp Exp $  
> <?php  // $Id: format.php,v 1.4.4.1 2007/11/02 16:20:29 tjhunt Exp $  
 
RCS file: /cvsroot/moodle/moodle/question/format/qti2/custommediafilter.php
> <?php // $Id: custommediafilter.php,v 1.2.4.1 2007/11/02 16:20:34 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/qti2/format.php
< <?php  // $Id: format.php,v 1.12 2007/03/20 02:28:50 pichetp Exp $ 
> <?php  // $Id: format.php,v 1.12.4.1 2007/11/02 16:20:35 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/webct/format.php
< <?php  // $Id: format.php,v 1.16 2007/09/07 02:38:02 pichetp Exp $ 
> <?php  // $Id: format.php,v 1.16.2.1 2007/11/02 16:20:52 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/xml/format.php
< <?php // $Id: format.php,v 1.41 2007/10/09 10:16:01 thepurpleblob Exp $ 
> <?php // $Id: format.php,v 1.41.2.1 2007/11/02 16:20:54 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/questiontype.php
< <?php  // $Id: questiontype.php,v 1.74 2007/09/27 07:41:58 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.74.2.1 2007/11/02 16:20:44 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/calculated/questiontype.php
< <?php  // $Id: questiontype.php,v 1.26.2.1 2007/10/31 02:48:30 pichetp Exp $ 
> <?php  // $Id: questiontype.php,v 1.26.2.2 2007/11/02 16:20:26 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/calculated/version.php
< <?PHP // $Id: version.php,v 1.2 2007/10/10 16:09:41 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.2.2.1 2007/11/02 16:20:26 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/calculated/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:14 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:32 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/calculated/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:08 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:32 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/calculated/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:42 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:32 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/datasetdependent/abstractqtype.php
< <?php  // $Id: abstractqtype.php,v 1.16 2007/08/09 21:53:12 jamiesensei Exp $ 
> <?php  // $Id: abstractqtype.php,v 1.16.2.1 2007/11/02 16:20:49 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/description/questiontype.php
< <?php  // $Id: questiontype.php,v 1.11 2007/09/04 11:55:23 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.11.2.1 2007/11/02 16:20:30 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/essay/questiontype.php
< <?php  // $Id: questiontype.php,v 1.20 2007/09/04 11:55:12 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.20.2.1 2007/11/02 16:20:31 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/essay/version.php
< <?PHP // $Id: version.php,v 1.2 2007/10/10 16:09:36 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.2.2.1 2007/11/02 16:20:31 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/essay/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:14 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:45 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/essay/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:08 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:46 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/essay/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:42 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:44 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/match/questiontype.php
< <?php  // $Id: questiontype.php,v 1.32.2.1 2007/10/22 16:57:09 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.32.2.2 2007/11/02 16:20:29 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/match/version.php
< <?PHP // $Id: version.php,v 1.2 2007/10/10 16:09:22 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.2.2.1 2007/11/02 16:20:30 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/match/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:15 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:27 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/match/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:08 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:27 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/match/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:42 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:27 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/missingtype/questiontype.php
< <?php  // $Id: questiontype.php,v 1.7 2007/09/04 11:55:17 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.7.2.1 2007/11/02 16:20:37 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/questiontype.php
< <?php  // $Id: questiontype.php,v 1.41 2007/10/06 20:51:28 pichetp Exp $ 
> <?php  // $Id: questiontype.php,v 1.41.2.1 2007/11/02 16:21:01 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/version.php
< <?PHP // $Id: version.php,v 1.2 2007/10/10 16:09:29 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.2.2.1 2007/11/02 16:21:00 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:15 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:33 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:08 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:33 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:43 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:33 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/questiontype.php
< <?php  // $Id: questiontype.php,v 1.29 2007/09/04 11:55:16 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.29.2.1 2007/11/02 16:20:34 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/version.php
< <?PHP // $Id: version.php,v 1.7 2007/10/10 16:09:17 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.7.2.1 2007/11/02 16:20:34 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/db/mysql.php
< <?php  //$Id: mysql.php,v 1.4 2006/10/26 22:39:15 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.4.8.1 2007/11/02 16:20:28 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.4 2006/10/26 22:46:09 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.4.8.1 2007/11/02 16:20:28 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.5 2007/08/17 10:01:36 tjhunt Exp $ 
> <?php  // $Id: upgrade.php,v 1.5.2.1 2007/11/02 16:20:28 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/numerical/questiontype.php
<  * @version $Id: questiontype.php,v 1.14 2007/04/24 23:37:32 tjhunt Exp $ 
>  * @version $Id: questiontype.php,v 1.14.4.1 2007/11/02 16:21:05 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/numerical/version.php
< <?PHP // $Id: version.php,v 1.3 2007/10/10 16:09:18 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.3.2.1 2007/11/02 16:21:05 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/numerical/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:15 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:35 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/numerical/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:09 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:35 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/numerical/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.5 2007/03/14 21:10:55 tjhunt Exp $ 
> <?php  // $Id: upgrade.php,v 1.5.4.1 2007/11/02 16:20:35 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/random/questiontype.php
< <?php  // $Id: questiontype.php,v 1.12 2007/09/26 16:10:39 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.12.2.1 2007/11/02 16:20:31 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/randomsamatch/questiontype.php
< <?php  // $Id: questiontype.php,v 1.4 2007/03/19 22:23:55 pichetp Exp $ 
> <?php  // $Id: questiontype.php,v 1.4.4.1 2007/11/02 16:20:48 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/randomsamatch/version.php
< <?PHP // $Id: version.php,v 1.3 2007/10/10 16:09:37 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.3.2.1 2007/11/02 16:20:48 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/randomsamatch/db/mysql.php
< <?php  //$Id: mysql.php,v 1.4 2006/10/26 22:39:15 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.4.8.1 2007/11/02 16:20:36 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/randomsamatch/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.4 2006/10/26 22:46:09 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.4.8.1 2007/11/02 16:20:36 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/randomsamatch/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:43 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:36 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/shortanswer/questiontype.php
< <?php  // $Id: questiontype.php,v 1.20.2.3 2007/11/01 00:32:11 pichetp Exp $ 
> <?php  // $Id: questiontype.php,v 1.20.2.4 2007/11/02 16:20:41 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/shortanswer/version.php
< <?PHP // $Id: version.php,v 1.2 2007/10/10 16:09:49 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.2.2.1 2007/11/02 16:20:41 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/shortanswer/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:18 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:39 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/shortanswer/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:09 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:39 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/shortanswer/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:43 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:39 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/truefalse/questiontype.php
< <?php  // $Id: questiontype.php,v 1.17 2007/09/20 15:57:02 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.17.2.1 2007/11/02 16:20:58 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/truefalse/version.php
< <?PHP // $Id: version.php,v 1.2 2007/10/10 16:09:25 skodak Exp $ 
> <?PHP // $Id: version.php,v 1.2.2.1 2007/11/02 16:20:58 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/truefalse/db/mysql.php
< <?php  //$Id: mysql.php,v 1.3 2006/10/26 22:39:19 stronk7 Exp $ 
> <?php  // $Id: mysql.php,v 1.3.8.1 2007/11/02 16:20:51 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/truefalse/db/postgres7.php
< <?php  //$Id: postgres7.php,v 1.3 2006/10/26 22:46:09 stronk7 Exp $ 
> <?php  // $Id: postgres7.php,v 1.3.8.1 2007/11/02 16:20:50 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/truefalse/db/upgrade.php
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 18:12:44 stronk7 Exp $ 
> <?php  // $Id: upgrade.php,v 1.1.10.1 2007/11/02 16:20:51 tjhunt Exp $

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.