|
|
(414 intermediate revisions by 6 users not shown) |
Line 1: |
Line 1: |
| ==Files with MOODLE_15_MERGED tag not updated - Tue Feb 6 17:01:29 CET 2007 == | | __NOEDITSECTION__ |
|
| | ==Unmerged Files Report== |
| RCS file: /cvsroot/moodle/moodle/lang/en/docs/Attic/release.html,v
| |
| < $Id: release.html,v 1.83.2.18 2006/02/06 09:59:38 moodler Exp $
| |
| > $Id: release.html,v 1.83.2.20 2006/05/21 07:59:15 moodler Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/lib/editor/Attic/htmlarea.php,v
| |
| < // $Id: htmlarea.php,v 1.60.2.9 2006/01/25 23:41:11 julmis Exp $
| |
| > // $Id: htmlarea.php,v 1.60.2.10 2006/05/14 09:22:24 urs_hunkler 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.2.6 2006/05/02 05:57:13 moodler Exp $
| |
| > <?PHP // $Id: lib.php,v 1.6.2.7 2006/08/31 21:36:32 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/hotpot/report.php,v
| |
| < <?PHP // $Id: report.php,v 1.1.2.2 2006/08/10 15:51:48 skodak Exp $
| |
| > <?PHP // $Id: report.php,v 1.1.2.3 2006/08/29 06:34:23 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/hotpot/view.php,v
| |
| < <?PHP // $Id: view.php,v 1.1.2.3 2006/08/10 15:51:48 skodak Exp $
| |
| > <?PHP // $Id: view.php,v 1.1.2.4 2007/01/28 00:12:42 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/fullstat/report.php,v
| |
| < <?php // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $
| |
| > <?php // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/overview/report.php,v
| |
| < <?php // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $
| |
| > <?php // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/simplestat/report.php,v
| |
| < <?php // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $
| |
| > <?php // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $
| |
|
| |
|
| ==Files with MOODLE_16_MERGED tag not updated - Fri Feb 9 01:47:25 CET 2007 ==
| | __UNMERGED_FILES_REPORT__ |
|
| |
| RCS file: /cvsroot/moodle/moodle/admin/Attic/utfdbmigrate.php,v
| |
| < <?php //$Id: utfdbmigrate.php,v 1.47.2.12 2006/07/29 09:43:36 skodak Exp $
| |
| > <?php //$Id: utfdbmigrate.php,v 1.47.2.13 2006/09/29 03:16:51 toyomoyo Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/blog/header.php,v
| |
| < <?php //$Id: header.php,v 1.19.2.3 2006/06/18 07:44:21 moodler Exp $
| |
| > <?php //$Id: header.php,v 1.19.2.4 2006/11/02 03:19:37 moodler Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/blog/lib.php,v
| |
| < <?php //$Id: lib.php,v 1.38.2.2 2006/10/07 16:34:20 gustav_delius Exp $
| |
| > <?php //$Id: lib.php,v 1.38.2.3 2006/11/02 05:52:48 moodler Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/grade/index.php,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/lang/en_utf8/hotpot.php,v
| |
| < <?PHP // $Id: hotpot.php,v 1.1.2.1 2006/05/24 11:22:07 gbateson Exp $
| |
| > <?PHP // $Id: hotpot.php,v 1.1.2.3 2006/10/05 06:21:26 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/hotpot/reportcontent.html,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/data/backuplib.php,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/data/restorelib.php,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/lesson/action/continue.php,v
| |
| < <?php // $Id: continue.php,v 1.19.2.4 2006/09/09 17:25:21 mark-nielsen Exp $
| |
| > <?php // $Id: continue.php,v 1.19.2.6 2006/12/06 01:45:31 mark-nielsen Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v
| |
| < <?php // $Id: report.php,v 1.26.2.2 2006/09/19 09:07:44 bobopinna Exp $
| |
| > <?php // $Id: report.php,v 1.26.2.3 2007/01/18 20:32:33 bobopinna Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/config.php,v
| |
| < <?PHP // $Id: config.php,v 1.4 2006/04/29 19:46:41 gustav_delius Exp $
| |
| > <?PHP // $Id: config.php,v 1.4.2.1 2006/11/02 18:10:14 watcanz Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/header.html,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_color.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_fonts.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_layout.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.jpg,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.psd,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/oceanblue/styles_color.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v
| |
| | |
| ==Files with MOODLE_17_MERGED tag not updated - Fri Feb 9 01:46:15 CET 2007 ==
| |
|
| |
| NONE!
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Wed Feb 14 20:55:35 CET 2007 ==
| |
| | |
| NONE!
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
Line 103: |
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_17_MERGED -r MOODLE_17_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== |
Line 110: |
Line 15: |
| * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. | | * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. |
|
| |
|
| [[Category:Developer]] | | * Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files. |
| | |
| | [[Category:Developer|Unmerged files]] |