Development:Unmerged files: Difference between revisions
From MoodleDocs
Line 19: | Line 19: | ||
> <?PHP // $Id: view.php,v 1.9.2.8 2005/07/15 07:15:42 bobopinna 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 - Thu Jan | ==Files with MOODLE_15_MERGED tag not updated - Thu Jan 19 17:29:28 CET 2006 == | ||
RCS file: /cvsroot/moodle/moodle/auth/ldap/lib.php,v | RCS file: /cvsroot/moodle/moodle/auth/ldap/lib.php,v | ||
Line 29: | Line 25: | ||
> * @version $Id: lib.php,v 1.61.2.17 2005/12/12 04:57: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/ | RCS file: /cvsroot/moodle/moodle/blocks/activity_modules/block_activity_modules.php,v | ||
< <? | < <?PHP //$Id: block_activity_modules.php,v 1.6 2005/03/02 19:22:20 defacer Exp $ | ||
> <? | > <?PHP //$Id: block_activity_modules.php,v 1.6.2.2 2006/01/13 19:26:36 michaelpenne Exp $ | ||
RCS file: /cvsroot/moodle/moodle/lib/adodb/server.php,v | RCS file: /cvsroot/moodle/moodle/lib/adodb/server.php,v | ||
Line 64: | Line 58: | ||
RCS file: /cvsroot/moodle/moodle/mod/lesson/view.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.7 2005/07/25 18:50:39 michaelpenne Exp $ | ||
> <?PHP // $Id: view.php,v 1.52.2. | > <?PHP // $Id: view.php,v 1.52.2.11 2006/01/13 19:51:45 michaelpenne Exp $ | ||
RCS file: /cvsroot/moodle/moodle/mod/quiz/category.php,v | RCS file: /cvsroot/moodle/moodle/mod/quiz/category.php,v |
Revision as of 16:29, 19 January 2006
Files with MOODLE_14_MERGED tag not updated - Thu Jan 19 17:26:29 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 - Thu Jan 19 17:29:28 CET 2006
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/blocks/activity_modules/block_activity_modules.php,v < <?PHP //$Id: block_activity_modules.php,v 1.6 2005/03/02 19:22:20 defacer Exp $ > <?PHP //$Id: block_activity_modules.php,v 1.6.2.2 2006/01/13 19:26:36 michaelpenne Exp $ RCS file: /cvsroot/moodle/moodle/lib/adodb/server.php,v < /*============================ DO NOT MODIFY BELOW HERE =================================*/ 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/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/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/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.11 2006/01/13 19:51:45 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/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 RCS file: /cvsroot/moodle/moodle/user/view.php,v < <?PHP // $Id: view.php,v 1.93.2.4 2005/12/02 02:34:08 toyomoyo Exp $ > <?PHP // $Id: view.php,v 1.93.2.5 2005/12/29 00:56:00 patrickslee Exp $