|
|
| (213 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 - Mon Dec 10 09:54:59 CET 2007 ==
| |
|
| |
| 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/hotpot/lib.php /cvsroot/moodle/mod/hotpot/lib.php]
| |
| < <?PHP // $Id: lib.php,v 1.57.2.8 2007/09/30 04:18:18 gbateson Exp $
| |
| > <?PHP // $Id: lib.php,v 1.57.2.9 2007/10/15 05:53:21 nicolasconnault 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 - Mon Dec 10 09:54:59 CET 2007 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/help.php /cvsroot/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.38.2.2 2007/05/23 13:36:29 nfreear Exp $
| |
| > * @version $Id: help.php,v 1.38.2.3 2007/11/06 13:38:34 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/admin/user.php /cvsroot/moodle/admin/user.php]
| |
|
| |
| 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/course/info.php /cvsroot/moodle/course/info.php]
| |
| < <?php // $Id: info.php,v 1.13.2.3 2007/03/05 05:38:46 moodler Exp $
| |
| > <?php // $Id: info.php,v 1.13.2.5 2007/12/07 00:15:50 mattc-catalyst 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/datalib.php /cvsroot/moodle/lib/datalib.php]
| |
| < <?php // $Id: datalib.php,v 1.365.2.31 2007/12/04 23:11:03 martinlanghoff Exp $
| |
| > <?php // $Id: datalib.php,v 1.365.2.32 2007/12/09 23:28:24 stronk7 Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/javascript-static.js /cvsroot/moodle/lib/javascript-static.js]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/moodlelib.php /cvsroot/moodle/lib/moodlelib.php]
| |
|
| |
| 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/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/wiki/mod_form.php /cvsroot/moodle/mod/wiki/mod_form.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/question/format.php /cvsroot/moodle/question/format.php]
| |
| < <?php // $Id: format.php,v 1.17.2.11 2007/09/17 10:59:32 thepurpleblob Exp $
| |
| > <?php // $Id: format.php,v 1.17.2.13 2007/11/15 14:04:22 mchurch Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/indexer.php /cvsroot/moodle/search/indexer.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_doc.php /cvsroot/moodle/search/documents/physical_doc.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/resource_document.php /cvsroot/moodle/search/documents/resource_document.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/search/documents/techproject_document.php /cvsroot/moodle/search/documents/techproject_document.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/userpix/index.php /cvsroot/moodle/userpix/index.php]
| |
| < <?php // $Id: index.php,v 1.10 2007/12/02 22:19:53 iarenaza Exp $
| |
| > <?php // $Id: index.php,v 1.8 2007/01/08 20:38:03 skodak Exp $
| |
| | |
| ==Files with MOODLE_19_MERGED tag not updated - Fri Dec 7 17:20:52 CET 2007 ==
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/version.php /cvsroot/moodle/version.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/admin/settings/grades.php /cvsroot/moodle/admin/settings/grades.php]
| |
| < <?php // $Id: grades.php,v 1.26 2007/12/07 09:14:51 nicolasconnault Exp $
| |
| > <?php // $Id: grades.php,v 1.14.2.10 2007/12/04 16:05:57 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/course/info.php /cvsroot/moodle/course/info.php]
| |
| < <?php // $Id: info.php,v 1.17.2.3 2007/11/20 02:34:55 mattc-catalyst Exp $
| |
| > <?php // $Id: info.php,v 1.17.2.4 2007/12/07 00:24:29 mattc-catalyst Exp $
| |
|
| |
| 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.118 2007/12/07 09:47:10 nicolasconnault Exp $
| |
| > <?php // $Id: lib.php,v 1.98.2.19 2007/12/05 09:35:18 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/grade/report/grader/styles.php /cvsroot/moodle/grade/report/grader/styles.php]
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/grades.php /cvsroot/moodle/lang/en_utf8/grades.php]
| |
| < <?PHP // $Id: grades.php,v 1.131 2007/12/05 09:35:19 nicolasconnault Exp $
| |
| > <?PHP // $Id: grades.php,v 1.111.2.19 2007/11/29 14:40:46 skodak Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/db/upgradelib.php /cvsroot/moodle/lib/db/upgradelib.php]
| |
| < <?php //$Id: upgradelib.php,v 1.12 2007/12/07 09:14:51 nicolasconnault Exp $
| |
| > <?php //$Id: upgradelib.php,v 1.9.2.1 2007/10/11 11:12:55 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/lib/grade/grade_category.php /cvsroot/moodle/lib/grade/grade_category.php]
| |
| < <?php // $Id: grade_category.php,v 1.115 2007/12/07 09:14:51 nicolasconnault Exp $
| |
| > <?php // $Id: grade_category.php,v 1.96.2.10 2007/12/03 15:42:13 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://cvs.moodle.org/moodle/mod/lesson/pagelib.php /cvsroot/moodle/mod/lesson/pagelib.php]
| |
| < <?php // $Id: pagelib.php,v 1.5.2.1 2007/10/12 16:09:42 tjhunt Exp $
| |
| > <?php // $Id: pagelib.php,v 1.5.2.2 2007/12/06 22:52:27 mattc-catalyst Exp $
| |
| < * @version $Id: pagelib.php,v 1.5.2.1 2007/10/12 16:09:42 tjhunt Exp $
| |
| > * @version $Id: pagelib.php,v 1.5.2.2 2007/12/06 22:52:27 mattc-catalyst Exp $
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 140: |
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_18_MERGED -r MOODLE_18_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== |
