commit: Automated merge with file:/Sources/xemacs-21.5-checked-out

[Aidan Kehoe]

changeset:   4332:234b2c136e4dcaccf2ac88a827c3bc6b82d314c1
tag:         tip
parent:      4331:3483b381b0a993bedfed6a96d4fbcee8e8b2a654
parent:      4329:8a38eea09ab5a1e5a81fde551283d0418a8fa821
user:        Aidan Kehoe <kehoea at parhasard.net>
date:        Tue Dec 18 19:44:28 2007 +0100
files:       
description:
Automated merge with file:/Sources/xemacs-21.5-checked-out


diff -r 3483b381b0a993bedfed6a96d4fbcee8e8b2a654 -r 234b2c136e4dcaccf2ac88a827c3bc6b82d314c1 .hgignore
--- a/.hgignore	Tue Dec 18 19:41:58 2007 +0100
+++ b/.hgignore	Tue Dec 18 19:44:28 2007 +0100
@@ -1,3 +1,44 @@
 (^|/)CVS($|/)
 (^|/)\.hg($|/)
 (^|/)\.hgtags($|/)
+\.o$
+\.elc$
+~$
+\.orig$
+info/.*\.info(-[0-9]+)?$
+^GNUmakefile$
+^Installation$
+^Makefile$
+^Makefile\.in$
+^autom4te\.cache
+^config\.(log|status)$
+^lib-src/DOC$
+^lib-src/(GNUmakefile|Makefile(\.in)?)$
+^lib-src/config\.values$
+^lib-src/(b2m|ctags|cvtmail|digest-doc|ellcc|etags|fakemail|gnuclient|gnuserv|hexl|insert-data-in-exec|make-docfile|make-dump-id|make-path|mmencode|movemail|ootags|profile|sorted-doc|wakeup|yow)$
+^lib-src/ellcc\.h$
+^lisp/(auto-autoloads|custom-load|finder-inf)\.el$
+^lisp/mule/(auto-autoloads|custom-load)\.el$
+^lwlib/(GNUmakefile|Makefile(\.in)?)$
+^lwlib/liblw\.a$
+^lwlib/config\.h$
+^modules/auto-autoloads\.el$
+^modules/ldap/(GNUmakefile|Makefile(\.in)?)$
+^modules/ldap/eldap\.ell$
+^modules/ldap/eldap_i\.c$
+^(xemacs|mule)-packages
+^etc/PROBLEMS$
+^src/(.dbxrc|.gdbinit)(\.in)?$ 
+^src/(GNUmakefile|Makefile(\.in)?)$
+^src/NEEDTODUMP$
+^src/config\.h$
+^src/dump-id\.c$
+^src/dump-size$
+^src/paths\.h$
+^src/sheap-adjust\.h$
+^src/temacs$
+^src/xemacs$
+^src/xemacs\.def(\.in)?$
+^src/xemacs\.dmp$
+^src/Emacs\.ad\.h$
+