|
|
| (545 intermediate revisions by 7 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | __UNMERGED_FILES_REPORT__ |
|
| |
|
| ==Files with MOODLE_14_MERGED tag not updated - Fri Feb 24 23:52:58 CET 2006 == | | ==To generate this information yourself== |
|
| |
| 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 - Fri Feb 24 23:53:25 CET 2006 ==
| | Run the following commandline at the top level of your CVS sandbox: |
|
| | |
| RCS file: /cvsroot/moodle/moodle/index.php,v | | cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt |
| < <?php // $Id: index.php,v 1.156.2.1 2005/12/22 00:13:43 ikawhero Exp $
| | |
| > <?php // $Id: index.php,v 1.156.2.2 2006/02/08 04:19:56 patrickslee Exp $
| | ==Some useful links== |
|
| | |
| RCS file: /cvsroot/moodle/moodle/auth/ldap/lib.php,v
| | * [[:en:Development:CVS for developers|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS. |
| < * @version $Id: lib.php,v 1.61.2.15 2005/11/07 00:38:23 martinlanghoff Exp $
| | * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. |
| > * @version $Id: lib.php,v 1.61.2.17 2005/12/12 04:57:23 martinlanghoff Exp $
| | |
|
| | * Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files. |
| RCS file: /cvsroot/moodle/moodle/blocks/course_list/block_course_list.php,v
| | |
| < <?PHP //$Id: block_course_list.php,v 1.24 2006/02/08 04:21:22 patrickslee Exp $
| | [[Category:Developer|Unmerged files]] |
| > <?PHP //$Id: block_course_list.php,v 1.20.2.3 2006/02/08 04:19:56 patrickslee Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/course/index.php,v
| |
| < <?php // $Id: index.php,v 1.43 2006/02/08 04:21:22 patrickslee Exp $
| |
| > <?php // $Id: index.php,v 1.39.2.2 2006/02/08 04:19:56 patrickslee 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/index.php,v
| |
| < <?PHP // $Id: index.php,v 1.10.2.1 2005/06/07 20:48:41 michaelpenne Exp $
| |
| > <?PHP // $Id: index.php,v 1.10.2.2 2006/02/24 21:27:51 michaelpenne 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.12 2006/02/24 20:25:36 michaelpenne 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.9 2006/02/03 08:51:13 bobopinna Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/playscorm.php,v
| |
| < <?PHP // $Id: playscorm.php,v 1.34.2.2 2005/07/26 06:18:23 bobopinna Exp $
| |
| > <?PHP // $Id: playscorm.php,v 1.34.2.3 2006/02/03 08:51:13 bobopinna Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v
| |
| < <?php // $Id: report.php,v 1.20 2005/05/23 06:56:10 bobopinna Exp $
| |
| > <?php // $Id: report.php,v 1.20.2.1 2006/02/03 08:51:13 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.3 2006/02/03 08:51:13 bobopinna 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/formal_white/fw_color.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
| |
