Note: You are currently viewing documentation for Moodle 3.7. Up-to-date documentation for the latest stable version of Moodle may be available here: Unmerged files.

Development:Unmerged files

From MoodleDocs

Files with MOODLE_14_MERGED tag not updated

Files with MOODLE_14_MERGED tag not updated - Thu Jan 12 12:36:36 CET 2006

RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.13.2.10 2005/05/10 00:28:45 martinlanghoff Exp $ 
> <?PHP  // $Id: lib.php,v 1.13.2.11 2005/06/29 07:00:16 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/playscorm.php,v 
< <?PHP  // $Id: playscorm.php,v 1.11.2.3 2004/11/22 23:29:17 martinlanghoff Exp $ 
> <?PHP  // $Id: playscorm.php,v 1.11.2.7 2005/07/15 07:15:42 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.3 2004/07/19 14:53:43 bobopinna Exp $ 
> <?PHP //$Id: restorelib.php,v 1.3.2.1 2005/06/29 07:00:16 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/view.php,v 
< <?PHP  // $Id: view.php,v 1.9.2.7 2005/05/10 23:45:58 mjollnir_ Exp $ 
> <?PHP  // $Id: view.php,v 1.9.2.8 2005/07/15 07:15:42 bobopinna Exp $

Files with MOODLE_15_MERGED tag not updated - Wed Dec 21 17:18:05 CET 2005

RCS file: /cvsroot/moodle/moodle/admin/index.php,v 
< <?php // $Id: index.php,v 1.141.2.5 2005/07/22 07:12:31 moodler Exp $ 
> <?php // $Id: index.php,v 1.141.2.7 2005/11/12 05:30:23 martinlanghoff Exp $ 

RCS file: /cvsroot/moodle/moodle/auth/cas/lib.php,v 
< // $Id: lib.php,v 1.6.2.1 2005/07/05 16:59:29 skodak Exp $ 
> // $Id: lib.php,v 1.6.2.2 2005/12/12 03:21:11 martinlanghoff Exp $ 

RCS file: /cvsroot/moodle/moodle/auth/ldap/lib.php,v 
<  * @version $Id: lib.php,v 1.61.2.15 2005/11/07 00:38:23 martinlanghoff Exp $ 
>  * @version $Id: lib.php,v 1.61.2.17 2005/12/12 04:57:23 martinlanghoff Exp $ 

RCS file: /cvsroot/moodle/moodle/enrol/authorize/enrol.html,v 

RCS file: /cvsroot/moodle/moodle/enrol/authorize/enrol.php,v 
< <?php  // $Id: enrol.php,v 1.6.2.6 2005/07/22 06:57:54 moodler Exp $ 
> <?php  // $Id: enrol.php,v 1.6.2.9 2005/12/05 09:40:02 ethem Exp $ 

RCS file: /cvsroot/moodle/moodle/enrol/authorize/version.php,v 
< <?PHP // $Id: version.php,v 1.1.2.3 2005/07/22 16:55:58 moodler Exp $^M 
> <?PHP // $Id: version.php,v 1.1.2.5 2005/12/02 14:12:26 ethem Exp $^M 

RCS file: /cvsroot/moodle/moodle/enrol/authorize/db/mysql.php,v 
< <?PHP  //$Id: mysql.php,v 1.1.2.2 2005/07/22 06:57:54 moodler Exp $^M 
> <?PHP  //$Id: mysql.php,v 1.1.2.5 2005/12/04 13:03:38 moodler Exp $^M 

RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v 
< <?php // $Id: moodlelib.php,v 1.565.2.49 2005/12/02 02:22:15 toyomoyo Exp $ 
> <?php // $Id: moodlelib.php,v 1.565.2.50 2005/12/13 03:33:46 patrickslee Exp $ 
<  * @version $Id: moodlelib.php,v 1.565.2.49 2005/12/02 02:22:15 toyomoyo Exp $ 
>  * @version $Id: moodlelib.php,v 1.565.2.50 2005/12/13 03:33:46 patrickslee Exp $ 

RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v 
< <?php // $Id: weblib.php,v 1.469.2.27 2005/11/16 02:11:52 mjollnir_ Exp $ 
> <?php // $Id: weblib.php,v 1.469.2.28 2005/11/17 06:44:10 moodler Exp $ 
<  * @version  $Id: weblib.php,v 1.469.2.27 2005/11/16 02:11:52 mjollnir_ Exp $ 
>  * @version  $Id: weblib.php,v 1.469.2.28 2005/11/17 06:44:10 moodler Exp $ 

RCS file: /cvsroot/moodle/moodle/lib/ipatlas/Attic/plot.php,v 

RCS file: /cvsroot/moodle/moodle/login/change_password.php,v 
< <?PHP // $Id: change_password.php,v 1.30.2.6 2005/11/26 01:01:56 defacer Exp $ 
> <?PHP // $Id: change_password.php,v 1.30.2.9 2005/12/04 22:59:39 mjollnir_ Exp $ 

RCS file: /cvsroot/moodle/moodle/message/send.php,v 
< <?php // $Id: send.php,v 1.4.2.1 2005/11/05 10:45:58 skodak Exp $ 
> <?php // $Id: send.php,v 1.4.2.2 2005/12/06 23:57:31 gustav_delius Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/choice/report.php,v 
< <?php  // $Id: report.php,v 1.33 2005/08/14 21:59:09 danmarsden Exp $ 
> <?php  // $Id: report.php,v 1.32.2.1 2005/08/14 21:56:16 danmarsden Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/choice/view.php,v 
< <?php  // $Id: view.php,v 1.73 2005/08/14 21:59:09 danmarsden Exp $ 
> <?php  // $Id: view.php,v 1.69.2.2 2005/08/14 21:56:16 danmarsden Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v 
< <?php // $Id: discuss.php,v 1.54.2.3 2005/12/08 06:46:23 moodler Exp $ 
> <?php // $Id: discuss.php,v 1.54.2.4 2005/12/20 05:11:24 toyomoyo Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v 
< <?php  // $Id: lib.php,v 1.381.2.10 2005/09/02 06:36:39 martinlanghoff Exp $ 
> <?php  // $Id: lib.php,v 1.381.2.12 2005/12/20 05:11:24 toyomoyo Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v 
< <?php // $Id: post.php,v 1.81.2.1 2005/09/21 21:27:11 stronk7 Exp $ 
> <?php // $Id: post.php,v 1.81.2.2 2005/11/25 07:09:04 moodler Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/forum/user.php,v 
< <?php // $Id: user.php,v 1.7.2.1 2005/07/13 14:20:29 moodler Exp $ 
> <?php // $Id: user.php,v 1.7.2.2 2005/11/07 09:18:34 moodler Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/README.TXT,v 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.6 2005/05/17 07:43:40 gbateson Exp $^M 
> <?PHP  // $Id: lib.php,v 1.6.2.5 2005/11/27 01:41:15 gbateson Exp $^M 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.1 2005/04/25 14:41:26 moodler Exp $^M 
> <?PHP //$Id: restorelib.php,v 1.1.2.1 2005/12/06 02:33:47 patrickslee Exp $^M 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/show.php,v 
< <?php // $Id: show.php,v 1.4 2005/05/17 07:45:39 gbateson Exp $^M 
> <?php // $Id: show.php,v 1.4.2.1 2005/09/20 11:57:53 gbateson Exp $^M 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/version.php,v 
< <?PHP // $Id: version.php,v 1.5 2005/05/20 20:44:25 gustav_delius Exp $ 
> <?PHP // $Id: version.php,v 1.5.2.2 2005/11/27 01:46:14 gbateson Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/fullstat/report.php,v 
< <?php  // $Id: report.php,v 1.1 2005/04/25 14:41:27 moodler Exp $^M 
> <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/overview/report.php,v 
< <?php  // $Id: report.php,v 1.1 2005/04/25 14:41:27 moodler Exp $^M 
> <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/simplestat/report.php,v 
< <?php  // $Id: report.php,v 1.1 2005/04/25 14:41:28 moodler Exp $^M 
> <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/lesson/report.php,v 

RCS file: /cvsroot/moodle/moodle/mod/lesson/view.php,v 
< <?PHP  // $Id: view.php,v 1.52.2.7 2005/07/25 18:50:39 michaelpenne Exp $ 
> <?PHP  // $Id: view.php,v 1.52.2.10 2005/10/14 19:26:21 michaelpenne Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/quiz/category.php,v 
< <?php // $Id: category.php,v 1.37 2005/05/16 22:51:09 stronk7 Exp $ 
> <?php // $Id: category.php,v 1.37.2.1 2005/12/06 21:01:32 patrickslee Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/quiz/export.php,v 
< <?php // $Id: export.php,v 1.16.2.3 2005/10/19 05:41:44 thepurpleblob Exp $ 
> <?php // $Id: export.php,v 1.16.2.5 2005/11/09 16:11:54 thepurpleblob Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/quiz/import.php,v 
< <?php // $Id: import.php,v 1.27.2.1 2005/08/26 11:33:08 thepurpleblob Exp $ 
> <?php // $Id: import.php,v 1.27.2.2 2005/11/09 16:11:54 thepurpleblob Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/quiz/locallib.php,v 
< <?php  // $Id: locallib.php,v 1.59.2.33 2005/11/28 04:21:00 moodler Exp $ 
> <?php  // $Id: locallib.php,v 1.59.2.34 2005/12/06 20:49:42 patrickslee Exp $ 
< * @version $Id: locallib.php,v 1.59.2.33 2005/11/28 04:21:00 moodler Exp $ 
> * @version $Id: locallib.php,v 1.59.2.34 2005/12/06 20:49:42 patrickslee Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/quiz/questiontypes/calculated/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.10.2.4 2005/09/26 12:31:22 mindforge Exp $ 
> <?php  // $Id: questiontype.php,v 1.10.2.5 2005/12/06 21:12:46 patrickslee Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v 
< <?php  // $Id: lib.php,v 1.47.2.6 2005/07/26 06:18:23 bobopinna Exp $ 
> <?php  // $Id: lib.php,v 1.47.2.8 2005/08/30 11:46:38 bobopinna Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/scorm/validate.php,v 
< <?php // $Id: validate.php,v 1.9 2005/05/23 06:56:10 bobopinna Exp $ 
> <?php // $Id: validate.php,v 1.9.2.1 2005/09/20 06:43:26 bobopinna Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/scorm/view.php,v 
< <?php  // $Id: view.php,v 1.28.2.1 2005/07/03 07:12:36 bobopinna Exp $ 
> <?php  // $Id: view.php,v 1.28.2.2 2005/11/22 03:44:55 moodler Exp $ 

RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm1_3.js.php,v 

RCS file: /cvsroot/moodle/moodle/mod/workshop/db/postgres7.php,v 
< <?php // $Id: postgres7.php,v 1.16 2005/10/12 02:15:42 mjollnir_ Exp $ 
> <?php // $Id: postgres7.php,v 1.14.2.2 2005/10/12 02:15:23 mjollnir_ Exp $ 

RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v 

RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v