|
|
| (94 intermediate revisions by 2 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | | __UNMERGED_FILES_REPORT__ |
| ==Files with MOODLE_17_MERGED tag not updated - Fri Jun 20 16:53:30 CEST 2008 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/question/backuplib.php /cvsroot/moodle/question/backuplib.php]
| |
| < <?php //$Id: backuplib.php,v 1.7.2.3 2007/03/02 05:20:39 moodler Exp $
| |
| > <?php //$Id: backuplib.php,v 1.7.2.4 2008/06/18 14:29:38 tjhunt Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/user/index.php /cvsroot/moodle/user/index.php]
| |
| < <?PHP // $Id: index.php,v 1.142.2.13 2007/07/04 08:33:04 skodak Exp $
| |
| > <?PHP // $Id: index.php,v 1.142.2.14 2008/05/28 14:57:24 mchurch Exp $
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Mon Jun 9 09:10:12 CEST 2008 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/admin/roles/assign.html /cvsroot/moodle/admin/roles/assign.html]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/scorm/datamodel.php /cvsroot/moodle/mod/scorm/datamodel.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/scorm/datamodels/scorm_13lib.php /cvsroot/moodle/mod/scorm/datamodels/scorm_13lib.php]
| |
| < <?php // $Id: scorm_13lib.php,v 1.6.2.2 2007/11/15 07:54:37 bobopinna Exp $
| |
| > <?php // $Id: scorm_13lib.php,v 1.6.2.3 2008/06/05 21:12:43 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/querylib.php /cvsroot/moodle/search/querylib.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_pdf.php /cvsroot/moodle/search/documents/physical_pdf.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_xml.php /cvsroot/moodle/search/documents/physical_xml.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/theme/standard/styles_layout.css /cvsroot/moodle/theme/standard/styles_layout.css]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/user/index.php /cvsroot/moodle/user/index.php]
| |
| < <?PHP // $Id: index.php,v 1.162.2.21 2008/04/15 05:45:57 dongsheng Exp $
| |
| > <?PHP // $Id: index.php,v 1.162.2.22 2008/05/28 14:56:02 mchurch Exp $
| |
| | |
| ==Files with MOODLE_19_MERGED tag not updated - Mon Jun 9 09:10:27 CEST 2008 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/tags /cvsroot/moodle/tags]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/quiz_grading.php /cvsroot/moodle/lang/en_utf8/quiz_grading.php]
| |
| < <?PHP // $Id: quiz_grading.php,v 1.3.8.2 2008/05/25 11:35:29 jamiesensei Exp $
| |
| > <?PHP // $Id: quiz_grading.php,v 1.3.8.4 2008/05/29 14:31:30 jamiesensei Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/help/quiz/timelimit.html /cvsroot/moodle/lang/en_utf8/help/quiz/timelimit.html]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/adminlib.php /cvsroot/moodle/lib/adminlib.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/quiz/lib.php /cvsroot/moodle/mod/quiz/lib.php]
| |
| < <?php // $Id: lib.php,v 1.282.2.13 2008/03/19 12:21:54 tjhunt Exp $
| |
| > <?php // $Id: lib.php,v 1.282.2.14 2008/05/21 11:10:04 tjhunt Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/quiz/report/grading/report.php /cvsroot/moodle/mod/quiz/report/grading/report.php]
| |
| < <?php // $Id: report.php,v 1.25.2.10 2008/05/26 14:24:51 jamiesensei Exp $
| |
| > <?php // $Id: report.php,v 1.25.2.11 2008/05/29 14:31:30 jamiesensei Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/scorm/datamodel.php /cvsroot/moodle/mod/scorm/datamodel.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/scorm/datamodels/scorm_13lib.php /cvsroot/moodle/mod/scorm/datamodels/scorm_13lib.php]
| |
| < <?php // $Id: scorm_13lib.php,v 1.7.2.2 2008/03/15 15:04:30 skodak Exp $
| |
| > <?php // $Id: scorm_13lib.php,v 1.7.2.3 2008/06/05 20:58:26 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/querylib.php /cvsroot/moodle/search/querylib.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_xml.php /cvsroot/moodle/search/documents/physical_xml.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/theme/standard/styles_color.css /cvsroot/moodle/theme/standard/styles_color.css]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/user/index.php /cvsroot/moodle/user/index.php]
| |
| < <?PHP // $Id: index.php,v 1.194.2.15 2008/05/08 02:42:53 jerome Exp $
| |
| > <?PHP // $Id: index.php,v 1.194.2.16 2008/05/28 14:52:15 mchurch Exp $
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 73: |
Line 8: |
| Run the following commandline at the top level of your CVS sandbox: | | Run the following commandline at the top level of your CVS sandbox: |
|
| |
|
| cvs diff -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] \/\/ \$Id)' > unmergedfiles.txt; cat unmergedfiles.txt | | cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt |
|
| |
|
| ==Some useful links== | | ==Some useful links== |
