|
|
| (471 intermediate revisions by 7 users not shown) |
| Line 1: |
Line 1: |
| ==Files with MOODLE_15_MERGED tag not updated - Tue Oct 10 16:43:40 CEST 2006 == | | __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
| | __UNMERGED_FILES_REPORT__ |
| < <?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/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 $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/mod.html,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/db/mysql.php,v
| |
| < <?php // $Id: mysql.php,v 1.29 2006/04/24 09:10:36 vyshane Exp $
| |
| > <?php // $Id: mysql.php,v 1.19.2.2 2006/06/05 08:11:29 bobopinna Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/db/mysql.sql,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/db/postgres7.php,v
| |
| < <?php // $Id: postgres7.php,v 1.40 2006/05/17 06:42:57 martinlanghoff Exp $
| |
| > <?php // $Id: postgres7.php,v 1.28.2.2 2006/06/05 08:11:29 bobopinna Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/scorm/db/postgres7.sql,v
| |
| | |
| ==Files with MOODLE_16_MERGED tag not updated - Tue Sep 26 18:17:48 CEST 2006 ==
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/version.php,v
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php,v
| |
| < <?PHP // $Id: lib.php,v 1.47.2.2 2006/09/13 08:17:50 gbateson Exp $
| |
| > <?PHP // $Id: lib.php,v 1.47.2.3 2006/09/26 12:21:38 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/lesson/lib.php,v
| |
| < <?PHP // $Id: lib.php,v 1.26.2.1 2006/05/26 11:46:32 skodak Exp $
| |
| > <?PHP // $Id: lib.php,v 1.26.2.2 2006/09/24 06:03:18 mark-nielsen Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/mod/quiz/db/postgres7.php,v
| |
| < <?php // $Id: postgres7.php,v 1.93.2.5 2006/07/18 10:58:40 tjhunt Exp $
| |
| > <?php // $Id: postgres7.php,v 1.93.2.6 2006/07/31 05:38:21 martinlanghoff Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/question/format/hotpot/format.php,v
| |
| < <?PHP // $Id: format.php,v 1.5 2006/03/28 19:22:35 stronk7 Exp $
| |
| > <?PHP // $Id: format.php,v 1.5.2.1 2006/08/30 07:54:48 gbateson Exp $
| |
|
| |
| RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 71: |
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_16_MERGED -r MOODLE_16_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== |
|
| |
|
| * [[:en:CVS (developer)|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS. | | * [[:en:Development:CVS for developers|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS. |
| * [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]] |
