COMMIT .cvsignore conflicts manually resolved by removing these files. Website update brought them back. Adrian xemacsweb ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: Develop/ChangeLog Index: Develop/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/ChangeLog,v retrieving revision 1.100 diff -u -U0 -r1.100 ChangeLog --- Develop/ChangeLog 4 Apr 2005 19:29:38 -0000 1.100 +++ Develop/ChangeLog 3 Dec 2005 10:52:19 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-12-03 Adrian Aichner <adrian(a)xemacs.org&gt; + + * adrian-testing-commit: quick fix. + xemacsweb source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: Develop/adrian-testing-commit Index: Develop/adrian-testing-commit =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/adrian-testing-commit,v retrieving revision 1.123 diff -u -w -r1.123 adrian-testing-commit --- Develop/adrian-testing-commit 23 Oct 2004 18:27:42 -0000 1.123 +++ Develop/adrian-testing-commit 3 Dec 2005 10:51:45 -0000 ＠＠ -158,3 +158,4 ＠＠ 2003-08-14T21:12:53+0200: Test after Esben's fix. 2003-08-14T21:19:00+0200: Trimming from-hosts to master website hosts 2004-10-23T20:26:03+0200: Update master websites after Local.rules merge from improved Local.rules.template (-path "./linklint*" -prune) +2005-12-03T11:50:40+0100: Trying the get www.dk.xemacs.org updated after conflict resolution. -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/