Note: You are currently viewing documentation for Moodle 2.3. Up-to-date documentation for the latest stable version is available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
Line 111: Line 111:
  RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
  RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v


==Files with MOODLE_17_MERGED tag not updated - Thu Oct 12 14:03:43 CEST 2006 ==
==Files with MOODLE_17_MERGED tag not updated - Fri Oct 20 01:33:43 CEST 2006 ==
    
    
  RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v
RCS file: /cvsroot/moodle/moodle/blocks/rss_client/block_rss_client.php,v
< <?php //$Id: block_rss_client.php,v 1.64 2006/10/01 16:17:30 skodak Exp $
> <?php //$Id: block_rss_client.php,v 1.64.2.1 2006/10/17 06:24:54 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/blocks/rss_client/config_instance_tabs.php,v
< <?php  // $Id: config_instance_tabs.php,v 1.7 2006/09/12 06:57:05 vyshane Exp $
> <?php  // $Id: config_instance_tabs.php,v 1.7.2.1 2006/10/17 06:24:54 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/quiz/requiresubnet.html,v
 
RCS file: /cvsroot/moodle/moodle/lib/magpie/README_MOODLE.txt,v
 
  RCS file: /cvsroot/moodle/moodle/lib/magpie/rss_fetch.inc,v
 
RCS file: /cvsroot/moodle/moodle/mod/chat/restorelib.php,v
< <?php //$Id: restorelib.php,v 1.19.2.1 2006/10/16 10:40:52 thompson697 Exp $
> <?php //$Id: restorelib.php,v 1.19.2.2 2006/10/17 07:19:19 vyshane Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v
< <?php // $Id: discuss.php,v 1.84 2006/10/03 01:19:35 moodler Exp $
> <?php // $Id: discuss.php,v 1.84.2.1 2006/10/17 04:45:22 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/backuplib.php,v
< <?php //$Id: backuplib.php,v 1.53 2006/08/22 19:00:18 tjhunt Exp $
> <?php //$Id: backuplib.php,v 1.53.4.1 2006/10/16 14:53:34 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/editlib.php,v
< <?php // $Id: editlib.php,v 1.35 2006/09/13 09:08:15 toyomoyo Exp $
> <?php // $Id: editlib.php,v 1.35.2.1 2006/10/16 11:04:18 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/restorelib.php,v
< <?PHP //$Id: restorelib.php,v 1.15.2.1 2006/10/16 10:40:51 thompson697 Exp $
> <?PHP //$Id: restorelib.php,v 1.15.2.2 2006/10/17 07:19:20 vyshane Exp $
 
RCS file: /cvsroot/moodle/moodle/question/category.php,v
< <?php // $Id: category.php,v 1.11 2006/09/13 09:08:16 toyomoyo Exp $
> <?php // $Id: category.php,v 1.11.2.1 2006/10/17 21:42:50 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/question/category_class.php,v
< <?php // $Id: category_class.php,v 1.8 2006/08/18 21:23:15 tjhunt Exp $
> <?php // $Id: category_class.php,v 1.8.4.1 2006/10/17 21:42:50 tjhunt Exp $
< * @version $Id: category_class.php,v 1.8 2006/08/18 21:23:15 tjhunt Exp $
>  * @version $Id: category_class.php,v 1.8.4.1 2006/10/17 21:42:50 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/question/format.php,v
< <?php  // $Id: format.php,v 1.13 2006/08/24 10:12:15 tjhunt Exp $ 
> <?php  // $Id: format.php,v 1.13.2.1 2006/10/17 10:51:45 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/gift/format.php,v
< <?php // $Id: format.php,v 1.8 2006/08/15 14:39:47 thepurpleblob Exp $
> <?php // $Id: format.php,v 1.8.4.1 2006/10/17 10:51:44 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/questiontype.php,v
< <?php  // $Id: questiontype.php,v 1.9.2.1 2006/10/12 02:39:17 toyomoyo Exp $
> <?php  // $Id: questiontype.php,v 1.9.2.2 2006/10/19 11:54:05 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/theme/chameleon/user_styles.css,v


==To generate this information yourself==
==To generate this information yourself==

Revision as of 23:34, 19 October 2006

Files with MOODLE_15_MERGED tag not updated - Fri Oct 20 01:27:48 CEST 2006

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/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 - Fri Oct 20 01:31:02 CEST 2006

RCS file: /cvsroot/moodle/moodle/admin/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/enrol/database/enrol.php,v 
< <?php  // $Id: enrol.php,v 1.22 2006/03/09 03:15:41 martinlanghoff Exp $ 
> <?php  // $Id: enrol.php,v 1.22.2.2 2006/09/28 01:16:01 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/blog.php,v 
< <?php  // $Id: blog.php,v 1.11.2.1 2006/05/25 19:23:54 skodak Exp $ 
> <?php  // $Id: blog.php,v 1.11.2.2 2006/10/19 06:52:30 moodler Exp $ 
 
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/login/forgot_password.php,v 
< // $Id: forgot_password.php,v 1.26.2.3 2006/09/07 05:50:05 skodak Exp $ 
> // $Id: forgot_password.php,v 1.26.2.4 2006/10/18 19:42:43 skodak Exp $ 
 
RCS file: /cvsroot/moodle/moodle/login/index.php,v 
< <?php // $Id: index.php,v 1.88.2.5 2006/07/06 10:09:34 skodak Exp $ 
> <?php // $Id: index.php,v 1.88.2.6 2006/10/08 19:03:52 skodak Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/hotpot-full.js,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/index.php,v 
< <?PHP // $Id: index.php,v 1.5 2005/11/08 07:48:10 gbateson Exp $ 
> <?PHP // $Id: index.php,v 1.5.4.3 2006/10/02 00:30:32 gbateson Exp $ 
 
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.4 2006/10/01 06:22:12 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/mod.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report.php,v 
< <?PHP  // $Id: report.php,v 1.8.2.1 2006/08/10 15:30:56 skodak Exp $ 
> <?PHP  // $Id: report.php,v 1.8.2.8 2006/10/11 01:41:26 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.11.2.3 2006/09/01 03:58:09 gbateson Exp $ 
> <?PHP //$Id: restorelib.php,v 1.11.2.4 2006/10/05 07:12:15 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/show.php,v 
< <?php // $Id: show.php,v 1.9 2006/03/07 21:46:30 skodak Exp $ 
> <?php // $Id: show.php,v 1.9.2.1 2006/09/28 12:41:49 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/mysql.php,v 
 
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/theme/chameleon/user_styles.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v

Files with MOODLE_17_MERGED tag not updated - Fri Oct 20 01:33:43 CEST 2006

RCS file: /cvsroot/moodle/moodle/blocks/rss_client/block_rss_client.php,v 
< <?php //$Id: block_rss_client.php,v 1.64 2006/10/01 16:17:30 skodak Exp $ 
> <?php //$Id: block_rss_client.php,v 1.64.2.1 2006/10/17 06:24:54 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blocks/rss_client/config_instance_tabs.php,v 
< <?php  // $Id: config_instance_tabs.php,v 1.7 2006/09/12 06:57:05 vyshane Exp $ 
> <?php  // $Id: config_instance_tabs.php,v 1.7.2.1 2006/10/17 06:24:54 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/quiz/requiresubnet.html,v 
 
RCS file: /cvsroot/moodle/moodle/lib/magpie/README_MOODLE.txt,v 
 
RCS file: /cvsroot/moodle/moodle/lib/magpie/rss_fetch.inc,v 
 
RCS file: /cvsroot/moodle/moodle/mod/chat/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.19.2.1 2006/10/16 10:40:52 thompson697 Exp $ 
> <?php //$Id: restorelib.php,v 1.19.2.2 2006/10/17 07:19:19 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v 
< <?php // $Id: discuss.php,v 1.84 2006/10/03 01:19:35 moodler Exp $ 
> <?php // $Id: discuss.php,v 1.84.2.1 2006/10/17 04:45:22 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/backuplib.php,v 
< <?php //$Id: backuplib.php,v 1.53 2006/08/22 19:00:18 tjhunt Exp $ 
> <?php //$Id: backuplib.php,v 1.53.4.1 2006/10/16 14:53:34 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/editlib.php,v 
< <?php // $Id: editlib.php,v 1.35 2006/09/13 09:08:15 toyomoyo Exp $ 
> <?php // $Id: editlib.php,v 1.35.2.1 2006/10/16 11:04:18 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.15.2.1 2006/10/16 10:40:51 thompson697 Exp $ 
> <?PHP //$Id: restorelib.php,v 1.15.2.2 2006/10/17 07:19:20 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/category.php,v 
< <?php // $Id: category.php,v 1.11 2006/09/13 09:08:16 toyomoyo Exp $ 
> <?php // $Id: category.php,v 1.11.2.1 2006/10/17 21:42:50 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/category_class.php,v 
< <?php // $Id: category_class.php,v 1.8 2006/08/18 21:23:15 tjhunt Exp $ 
> <?php // $Id: category_class.php,v 1.8.4.1 2006/10/17 21:42:50 tjhunt Exp $ 
< * @version $Id: category_class.php,v 1.8 2006/08/18 21:23:15 tjhunt Exp $ 
>  * @version $Id: category_class.php,v 1.8.4.1 2006/10/17 21:42:50 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format.php,v 
< <?php  // $Id: format.php,v 1.13 2006/08/24 10:12:15 tjhunt Exp $  
> <?php  // $Id: format.php,v 1.13.2.1 2006/10/17 10:51:45 tjhunt Exp $  
 
RCS file: /cvsroot/moodle/moodle/question/format/gift/format.php,v 
< <?php // $Id: format.php,v 1.8 2006/08/15 14:39:47 thepurpleblob Exp $ 
> <?php // $Id: format.php,v 1.8.4.1 2006/10/17 10:51:44 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multichoice/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.9.2.1 2006/10/12 02:39:17 toyomoyo Exp $ 
> <?php  // $Id: questiontype.php,v 1.9.2.2 2006/10/19 11:54:05 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/chameleon/user_styles.css,v

To generate this information yourself

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

Some useful links

Retrieved from "https://docs.moodle.org/23/en/index.php?title=Development:Unmerged_files&oldid=17319"
Powered by MediaWiki