|
|
| (162 intermediate revisions by 4 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | | __UNMERGED_FILES_REPORT__ |
| ==Files with MOODLE_17_MERGED tag not updated - Sun Feb 3 01:02:05 CET 2008 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/install.php /cvsroot/moodle/install.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/blocks/participants/block_participants.php /cvsroot/moodle/blocks/participants/block_participants.php]
| |
| < <?PHP //$Id: block_participants.php,v 1.29 2006/09/20 20:31:46 skodak Exp $
| |
| > <?PHP //$Id: block_participants.php,v 1.29.2.2 2008/01/30 16:54:38 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/grade/lib.php /cvsroot/moodle/grade/lib.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/setuplib.php /cvsroot/moodle/lib/setuplib.php]
| |
| < <?php // $Id: setuplib.php,v 1.9.2.4 2007/01/08 18:59:21 stronk7 Exp $
| |
| > <?php // $Id: setuplib.php,v 1.9.2.5 2007/11/13 23:52:36 arborrow Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/resource/type/ims/finder.php /cvsroot/moodle/mod/resource/type/ims/finder.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/wiki/ewiki/ewiki.php /cvsroot/moodle/mod/wiki/ewiki/ewiki.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/wiki/ewiki/plugins/init.php /cvsroot/moodle/mod/wiki/ewiki/plugins/init.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/wiki/ewiki/plugins/spages.php /cvsroot/moodle/mod/wiki/ewiki/plugins/spages.php]
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Sun Jan 27 16:43:28 CET 2008 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/admin/mnet/peers.html /cvsroot/moodle/admin/mnet/peers.html]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/auth/mnet/auth.php /cvsroot/moodle/auth/mnet/auth.php]
| |
| < <?php // $Id: auth.php,v 1.14.2.13 2007/10/11 13:19:53 nicolasconnault Exp $
| |
| > <?php // $Id: auth.php,v 1.14.2.15 2007/11/01 06:13:19 donal72 Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/blocks/loancalc/block_loancalc.php /cvsroot/moodle/blocks/loancalc/block_loancalc.php]
| |
| < <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $
| |
| > <?php // $Id: block_loancalc.php,v 1.9.2.1 2007/10/22 20:29:45 arborrow Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/enrol/mnet/config.html /cvsroot/moodle/enrol/mnet/config.html]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/enrol/mnet/enrol.php /cvsroot/moodle/enrol/mnet/enrol.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/enrol/paypal/enrol.php /cvsroot/moodle/enrol/paypal/enrol.php]
| |
| < <?php // $Id: enrol.php,v 1.26 2006/12/18 19:21:11 skodak Exp $
| |
| > <?php // $Id: enrol.php,v 1.26.2.1 2007/11/13 18:02:28 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/enrol_mnet.php /cvsroot/moodle/lang/en_utf8/enrol_mnet.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/mnet.php /cvsroot/moodle/lang/en_utf8/mnet.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/pagelib.php /cvsroot/moodle/lib/pagelib.php]
| |
| < <?php //$Id: pagelib.php,v 1.52.2.2 2007/09/12 10:46:07 skodak Exp $
| |
| > <?php //$Id: pagelib.php,v 1.52.2.3 2007/12/27 21:25:19 mchurch Exp $
| |
| < * @version $Id: pagelib.php,v 1.52.2.2 2007/09/12 10:46:07 skodak Exp $
| |
| > * @version $Id: pagelib.php,v 1.52.2.3 2007/12/27 21:25:19 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mnet/testclient.php /cvsroot/moodle/mnet/testclient.php]
| |
| > <?php // $Id: testclient.php,v 1.1.2.2 2007/10/19 00:45:56 donal72 Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mnet/xmlrpc/client.php /cvsroot/moodle/mnet/xmlrpc/client.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mnet/xmlrpc/server.php /cvsroot/moodle/mnet/xmlrpc/server.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/mnet/xmlrpc/xmlparser.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/chat/lib.php /cvsroot/moodle/mod/chat/lib.php]
| |
| < <?php // $Id: lib.php,v 1.99.2.5 2008/01/08 20:58:32 martinlanghoff Exp $
| |
| > <?php // $Id: lib.php,v 1.93.2.1 2007/03/01 07:18:32 defacer Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/choice/view.php /cvsroot/moodle/mod/choice/view.php]
| |
| < <?php // $Id: view.php,v 1.93.2.3 2007/08/22 20:03:46 skodak Exp $
| |
| > <?php // $Id: view.php,v 1.93.2.4 2008/01/25 06:28:26 moodler Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/data/lib.php /cvsroot/moodle/mod/data/lib.php]
| |
| < <?php // $Id: lib.php,v 1.113.2.7 2007/08/21 03:34:53 moodler Exp $
| |
| > <?php // $Id: lib.php,v 1.113.2.8 2007/12/06 00:45:31 toyomoyo Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/data/preset.php /cvsroot/moodle/mod/data/preset.php]
| |
| < <?php // $Id: preset.php,v 1.20.2.3 2007/04/26 21:38:28 mjollnir_ Exp $
| |
| > <?php // $Id: preset.php,v 1.20.2.4 2007/12/06 00:45:32 toyomoyo Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/lesson/locallib.php /cvsroot/moodle/mod/lesson/locallib.php]
| |
| < <?php // $Id: locallib.php,v 1.61.2.6 2007/10/13 02:24:56 mark-nielsen Exp $
| |
| > <?php // $Id: locallib.php,v 1.61.2.7 2007/12/30 19:07:23 mark-nielsen Exp $
| |
| < * @version $Id: locallib.php,v 1.61.2.6 2007/10/13 02:24:56 mark-nielsen Exp $
| |
| > * @version $Id: locallib.php,v 1.61.2.7 2007/12/30 19:07:23 mark-nielsen Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/resource/type/file/resource.class.php /cvsroot/moodle/mod/resource/type/file/resource.class.php]
| |
| < <?php // $Id: resource.class.php,v 1.53.2.17 2007/11/05 14:10:38 nicolasconnault Exp $
| |
| > <?php // $Id: resource.class.php,v 1.53.2.18 2008/01/23 16:32:30 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/wiki/mod_form.php /cvsroot/moodle/mod/wiki/mod_form.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/wiki/ewiki/ewiki.php /cvsroot/moodle/mod/wiki/ewiki/ewiki.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/question/format/xml/format.php /cvsroot/moodle/question/format/xml/format.php]
| |
| < <?php // $Id: format.php,v 1.21.2.15 2007/10/30 17:52:43 tjhunt Exp $
| |
| > <?php // $Id: format.php,v 1.21.2.16 2008/01/15 14:58:10 thepurpleblob Exp $
| |
| | |
| ==Files with MOODLE_19_MERGED tag not updated - Sun Jan 27 16:43:42 CET 2008 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/grade/report/grader/lib.php /cvsroot/moodle/grade/report/grader/lib.php]
| |
| < <?php // $Id: lib.php,v 1.98.2.25 2008/01/23 19:04:45 skodak Exp $
| |
| > <?php // $Id: lib.php,v 1.98.2.26 2008/01/24 20:11:21 poltawski Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/hotpot/report.php /cvsroot/moodle/mod/hotpot/report.php]
| |
| < <?PHP // $Id: report.php,v 1.38.2.3 2008/01/21 07:00:21 gbateson Exp $
| |
| > <?PHP // $Id: report.php,v 1.38.2.4 2008/01/21 13:39:52 nicolasconnault Exp $
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 110: |
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== |
