|
|
| (273 intermediate revisions by 5 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | | __UNMERGED_FILES_REPORT__ |
| ==Files with MOODLE_17_MERGED tag not updated - Wed Oct 10 16:06:51 CEST 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/grade/lib.php /cvsroot/moodle/moodle/grade/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/moodle.php /cvsroot/moodle/moodle/lang/en_utf8/moodle.php]
| |
| < <?PHP // $Id: moodle.php,v 1.65.2.15 2007/03/30 02:27:27 toyomoyo Exp $
| |
| > <?PHP // $Id: moodle.php,v 1.65.2.16 2007/10/03 00:02:37 whchuang Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/scorm.php /cvsroot/moodle/moodle/lang/en_utf8/scorm.php]
| |
| < <?PHP // $Id: scorm.php,v 1.9.2.2 2007/03/13 08:47:52 moodler Exp $
| |
| > <?PHP // $Id: scorm.php,v 1.9.2.3 2007/07/03 08:05:57 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/accesslib.php /cvsroot/moodle/moodle/lib/accesslib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/lib.php /cvsroot/moodle/moodle/mod/scorm/lib.php]
| |
| < <?php // $Id: lib.php,v 1.76.2.2 2007/03/29 08:18:35 csantossaenz Exp $
| |
| > <?php // $Id: lib.php,v 1.76.2.3 2007/07/03 14:11:20 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php]
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Wed Oct 10 16:06:54 CEST 2007 ==
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/locallib.php /cvsroot/moodle/moodle/mod/scorm/locallib.php]
| |
| < <?php // $Id: locallib.php,v 1.34.2.7 2007/06/06 22:16:38 bobopinna Exp $
| |
| > <?php // $Id: locallib.php,v 1.34.2.8 2007/09/13 10:26:58 bobopinna Exp $
| |
|
| |
| I don't know what to do with that one...
| |
| | |
| == MOODLE 17 - MDL-11632 ==
| |
| | |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/uploaduser.php /cvsroot/moodle/moodle/admin/uploaduser.php]
| |
| < <?php // $Id: uploaduser.php,v 1.47.2.1 2007/04/18 02:45:14 cataluke Exp $
| |
| > <?php // $Id: uploaduser.php,v 1.47.2.2 2007/10/10 21:33:29 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/config.html /cvsroot/moodle/moodle/auth/cas/config.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/info.php /cvsroot/moodle/moodle/course/info.php]
| |
| < <?php // $Id: info.php,v 1.11.10.2 2007/04/01 15:51:06 moodler Exp $
| |
| > <?php // $Id: info.php,v 1.11.10.3 2007/10/10 21:33:32 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/search.php /cvsroot/moodle/moodle/course/search.php]
| |
| < <?php // $Id: search.php,v 1.25.2.3 2007/02/17 17:16:41 tjhunt Exp $
| |
| > <?php // $Id: search.php,v 1.25.2.4 2007/10/10 21:33:33 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/user.php /cvsroot/moodle/moodle/course/user.php]
| |
| < <?php // $Id: user.php,v 1.58.2.4 2006/10/31 15:06:02 moodler Exp $
| |
| > <?php // $Id: user.php,v 1.58.2.5 2007/10/10 21:33:34 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/import/groups/index.php /cvsroot/moodle/moodle/course/import/groups/index.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/report/outline/index.php /cvsroot/moodle/moodle/course/report/outline/index.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/languages.php /cvsroot/moodle/moodle/lib/languages.php]
| |
| < <?php // $Id: languages.php,v 1.6 2005/09/16 02:25:22 moodler Exp $
| |
| > <?php // $Id: languages.php,v 1.6.14.1 2007/10/10 21:33:35 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/readme_moodle.txt /cvsroot/moodle/moodle/lib/adodb/readme_moodle.txt]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-ar.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-ar.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-bg.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-bg.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-bgutf8.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-bgutf8.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-en.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-en.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-pl.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-pl.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-ro.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-ro.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/login/forgot_password.php /cvsroot/moodle/moodle/login/forgot_password.php]
| |
| < // $Id: forgot_password.php,v 1.29.2.2 2006/12/01 09:15:12 skodak Exp $
| |
| > // $Id: forgot_password.php,v 1.29.2.3 2007/10/10 21:33:40 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/choice/index.php /cvsroot/moodle/moodle/mod/choice/index.php]
| |
| < <?php // $Id: index.php,v 1.27 2006/09/02 11:44:04 skodak Exp $
| |
| > <?php // $Id: index.php,v 1.27.2.1 2007/10/10 21:33:41 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/exercise/assessments.php /cvsroot/moodle/moodle/mod/exercise/assessments.php]
| |
| < <?php // $Id: assessments.php,v 1.34 2006/08/14 05:55:43 moodler Exp $
| |
| > <?php // $Id: assessments.php,v 1.34.4.1 2007/10/10 21:33:41 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/index.php /cvsroot/moodle/moodle/mod/journal/index.php]
| |
| < <?php // $Id: index.php,v 1.21 2006/04/05 07:46:53 gustav_delius Exp $
| |
| > <?php // $Id: index.php,v 1.21.8.1 2007/10/10 21:33:44 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/report.php /cvsroot/moodle/moodle/mod/journal/report.php]
| |
| < <?php // $Id: report.php,v 1.34 2006/09/21 09:54:00 stronk7 Exp $
| |
| > <?php // $Id: report.php,v 1.34.2.1 2007/10/10 21:33:45 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/label/view.php /cvsroot/moodle/moodle/mod/label/view.php]
| |
| < <?php // $Id: view.php,v 1.4 2006/08/08 22:10:00 skodak Exp $
| |
| > <?php // $Id: view.php,v 1.4.4.1 2007/10/10 21:33:46 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/lesson/action/confirmdelete.php /cvsroot/moodle/moodle/mod/lesson/action/confirmdelete.php]
| |
| < <?php // $Id: confirmdelete.php,v 1.5 2006/09/30 19:49:41 mark-nielsen Exp $
| |
| > <?php // $Id: confirmdelete.php,v 1.5.2.1 2007/10/10 21:33:47 iarenaza Exp $
| |
| < * @version $Id: confirmdelete.php,v 1.5 2006/09/30 19:49:41 mark-nielsen Exp $
| |
| > * @version $Id: confirmdelete.php,v 1.5.2.1 2007/10/10 21:33:47 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/index.php /cvsroot/moodle/moodle/mod/resource/index.php]
| |
| < <?php // $Id: index.php,v 1.18 2006/03/08 00:08:51 skodak Exp $
| |
| > <?php // $Id: index.php,v 1.18.8.1 2007/10/10 21:33:47 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/repository/hive/openlitepublish.php /cvsroot/moodle/moodle/mod/resource/type/repository/hive/openlitepublish.php]
| |
| < <?php // $Id: openlitepublish.php,v 1.2 2006/09/22 13:27:56 moodler Exp $
| |
| > <?php // $Id: openlitepublish.php,v 1.2.2.1 2007/10/10 21:33:51 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodel.php /cvsroot/moodle/moodle/mod/scorm/datamodel.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/survey/download.php /cvsroot/moodle/moodle/mod/survey/download.php]
| |
| < <?php // $Id: download.php,v 1.23 2006/08/30 08:43:19 toyomoyo Exp $
| |
| > <?php // $Id: download.php,v 1.23.2.1 2007/10/10 21:33:52 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/assess.php /cvsroot/moodle/moodle/mod/workshop/assess.php]
| |
| < <?php // $Id: assess.php,v 1.11 2006/09/22 03:28:56 vyshane Exp $
| |
| > <?php // $Id: assess.php,v 1.11.2.1 2007/10/10 21:33:53 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/assessments.php /cvsroot/moodle/moodle/mod/workshop/assessments.php]
| |
| < <?php // $Id: assessments.php,v 1.51 2006/09/22 03:28:56 vyshane Exp $
| |
| > <?php // $Id: assessments.php,v 1.51.2.1 2007/10/10 21:33:53 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/upload.php /cvsroot/moodle/moodle/mod/workshop/upload.php]
| |
| < <?php // $Id: upload.php,v 1.27 2006/09/22 03:28:56 vyshane Exp $
| |
| > <?php // $Id: upload.php,v 1.27.2.1 2007/10/10 21:33:53 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/viewassessment.php /cvsroot/moodle/moodle/mod/workshop/viewassessment.php]
| |
| < <?php // $Id: viewassessment.php,v 1.11 2006/09/06 08:41:47 skodak Exp $
| |
| > <?php // $Id: viewassessment.php,v 1.11.2.1 2007/10/10 21:33:53 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/export.php /cvsroot/moodle/moodle/question/export.php]
| |
| < <?php // $Id: export.php,v 1.22.2.5 2007/04/20 12:59:36 thepurpleblob Exp $
| |
| > <?php // $Id: export.php,v 1.22.2.6 2007/10/10 21:33:54 iarenaza Exp $
| |
| < * @version $Id: export.php,v 1.22.2.5 2007/04/20 12:59:36 thepurpleblob Exp $
| |
| > * @version $Id: export.php,v 1.22.2.6 2007/10/10 21:33:54 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/sso/hive/login.php /cvsroot/moodle/moodle/sso/hive/login.php]
| |
| < <?php // $Id: login.php,v 1.3 2006/09/20 19:46:53 skodak Exp $
| |
| > <?php // $Id: login.php,v 1.3.2.1 2007/10/10 21:33:54 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/chameleon/ui/chameleon.php /cvsroot/moodle/moodle/theme/chameleon/ui/chameleon.php]
| |
| | |
| == MOODLE 18 - MDL-11632 ==
| |
| | |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/uploaduser.php /cvsroot/moodle/moodle/admin/uploaduser.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/languages.php /cvsroot/moodle/moodle/auth/cas/languages.php]
| |
| < // version $Id: languages.php,v 1.2.20.5 2007/07/17 11:55:09 jgutierr25 Exp $
| |
| > // version $Id: languages.php,v 1.2.20.6 2007/10/10 21:09:22 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/search.php /cvsroot/moodle/moodle/course/search.php]
| |
| < <?php // $Id: search.php,v 1.35.2.9 2007/03/02 01:24:47 nicolasconnault Exp $
| |
| > <?php // $Id: search.php,v 1.35.2.10 2007/10/10 21:09:23 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/user.php /cvsroot/moodle/moodle/course/user.php]
| |
| < <?php // $Id: user.php,v 1.66.2.4 2007/10/07 09:15:37 moodler Exp $
| |
| > <?php // $Id: user.php,v 1.66.2.5 2007/10/10 21:09:23 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/import/groups/index.php /cvsroot/moodle/moodle/course/import/groups/index.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/weblib.php /cvsroot/moodle/moodle/lib/weblib.php]
| |
| < <?php // $Id: weblib.php,v 1.812.2.86 2007/10/05 07:18:11 toyomoyo Exp $
| |
| > <?php // $Id: weblib.php,v 1.812.2.87 2007/10/10 16:05:18 jmg324 Exp $
| |
| < * @version $Id: weblib.php,v 1.812.2.86 2007/10/05 07:18:11 toyomoyo Exp $
| |
| > * @version $Id: weblib.php,v 1.812.2.87 2007/10/10 16:05:18 jmg324 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/readme_moodle.txt /cvsroot/moodle/moodle/lib/adodb/readme_moodle.txt]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-ar.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-ar.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-bg.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-bg.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-bgutf8.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-bgutf8.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-en.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-en.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-pl.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-pl.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-ro.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-ro.inc.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/lib.php /cvsroot/moodle/moodle/mnet/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/choice/index.php /cvsroot/moodle/moodle/mod/choice/index.php]
| |
| < <?php // $Id: index.php,v 1.27 2006/09/02 11:44:04 skodak Exp $
| |
| > <?php // $Id: index.php,v 1.27.6.1 2007/10/10 21:09:26 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/exercise/assessments.php /cvsroot/moodle/moodle/mod/exercise/assessments.php]
| |
| < <?php // $Id: assessments.php,v 1.35 2007/01/06 19:23:05 skodak Exp $
| |
| > <?php // $Id: assessments.php,v 1.35.2.1 2007/10/10 21:09:26 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/glossary/tabs.php /cvsroot/moodle/moodle/mod/glossary/tabs.php]
| |
| < <?php // $Id: tabs.php,v 1.1.2.5 2007/03/30 00:24:54 stronk7 Exp $
| |
| > <?php // $Id: tabs.php,v 1.1.2.6 2007/10/10 21:09:28 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/index.php /cvsroot/moodle/moodle/mod/journal/index.php]
| |
| < <?php // $Id: index.php,v 1.21 2006/04/05 07:46:53 gustav_delius Exp $
| |
| > <?php // $Id: index.php,v 1.21.12.1 2007/10/10 21:09:28 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/report.php /cvsroot/moodle/moodle/mod/journal/report.php]
| |
| < <?php // $Id: report.php,v 1.34.6.1 2007/05/15 18:26:50 skodak Exp $
| |
| > <?php // $Id: report.php,v 1.34.6.2 2007/10/10 21:09:28 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/label/view.php /cvsroot/moodle/moodle/mod/label/view.php]
| |
| < <?php // $Id: view.php,v 1.4 2006/08/08 22:10:00 skodak Exp $
| |
| > <?php // $Id: view.php,v 1.4.8.1 2007/10/10 21:09:29 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/lesson/action/confirmdelete.php /cvsroot/moodle/moodle/mod/lesson/action/confirmdelete.php]
| |
| < <?php // $Id: confirmdelete.php,v 1.5 2006/09/30 19:49:41 mark-nielsen Exp $
| |
| > <?php // $Id: confirmdelete.php,v 1.5.6.1 2007/10/10 21:09:29 iarenaza Exp $
| |
| < * @version $Id: confirmdelete.php,v 1.5 2006/09/30 19:49:41 mark-nielsen Exp $
| |
| > * @version $Id: confirmdelete.php,v 1.5.6.1 2007/10/10 21:09:29 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/index.php /cvsroot/moodle/moodle/mod/resource/index.php]
| |
| < <?php // $Id: index.php,v 1.20.2.1 2007/02/28 05:36:18 nicolasconnault Exp $
| |
| > <?php // $Id: index.php,v 1.20.2.2 2007/10/10 21:09:29 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/repository/hive/openlitepublish.php /cvsroot/moodle/moodle/mod/resource/type/repository/hive/openlitepublish.php]
| |
| < <?php // $Id: openlitepublish.php,v 1.2 2006/09/22 13:27:56 moodler Exp $
| |
| > <?php // $Id: openlitepublish.php,v 1.2.6.1 2007/10/10 21:09:30 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodel.php /cvsroot/moodle/moodle/mod/scorm/datamodel.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/survey/download.php /cvsroot/moodle/moodle/mod/survey/download.php]
| |
| < <?php // $Id: download.php,v 1.24 2006/12/21 19:46:29 skodak Exp $
| |
| > <?php // $Id: download.php,v 1.24.2.1 2007/10/10 21:09:31 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/assess.php /cvsroot/moodle/moodle/mod/workshop/assess.php]
| |
| < <?php // $Id: assess.php,v 1.14.2.1 2007/02/28 05:36:36 nicolasconnault Exp $
| |
| > <?php // $Id: assess.php,v 1.14.2.2 2007/10/10 21:09:32 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/assessments.php /cvsroot/moodle/moodle/mod/workshop/assessments.php]
| |
| < <?php // $Id: assessments.php,v 1.57 2007/01/10 08:29:42 toyomoyo Exp $
| |
| > <?php // $Id: assessments.php,v 1.57.2.1 2007/10/10 21:09:32 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/upload.php /cvsroot/moodle/moodle/mod/workshop/upload.php]
| |
| < <?php // $Id: upload.php,v 1.27 2006/09/22 03:28:56 vyshane Exp $
| |
| > <?php // $Id: upload.php,v 1.27.6.1 2007/10/10 21:09:33 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/viewassessment.php /cvsroot/moodle/moodle/mod/workshop/viewassessment.php]
| |
| < <?php // $Id: viewassessment.php,v 1.13 2007/01/10 08:29:42 toyomoyo Exp $
| |
| > <?php // $Id: viewassessment.php,v 1.13.2.1 2007/10/10 21:09:33 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/export.php /cvsroot/moodle/moodle/question/export.php]
| |
| < <?php // $Id: export.php,v 1.28.2.5 2007/09/19 17:57:52 tjhunt Exp $
| |
| > <?php // $Id: export.php,v 1.28.2.6 2007/10/10 21:09:34 iarenaza Exp $
| |
| < * @version $Id: export.php,v 1.28.2.5 2007/09/19 17:57:52 tjhunt Exp $
| |
| > * @version $Id: export.php,v 1.28.2.6 2007/10/10 21:09:34 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format/blackboard/format.php /cvsroot/moodle/moodle/question/format/blackboard/format.php]
| |
| < <?php // $Id: format.php,v 1.8.2.1 2007/03/14 15:14:14 thepurpleblob Exp $
| |
| > <?php // $Id: format.php,v 1.8.2.2 2007/10/10 21:09:35 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/sso/hive/login.php /cvsroot/moodle/moodle/sso/hive/login.php]
| |
| < <?php // $Id: login.php,v 1.3 2006/09/20 19:46:53 skodak Exp $
| |
| > <?php // $Id: login.php,v 1.3.6.1 2007/10/10 21:09:35 iarenaza Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/chameleon/ui/chameleon.php /cvsroot/moodle/moodle/theme/chameleon/ui/chameleon.php]
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 266: |
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== |
| Line 273: |
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. |
|
| |
|
| * [http://tracker.moodle.org/browse/MDL-8912 Tracker Task MDL-8912]: Progress in the Moodle Tracker about these unmerged files. | | * Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files. |
|
| |
|
| [[Category:Developer|Unmerged files]] | | [[Category:Developer|Unmerged files]] |
