# HG changeset patch
# User mikael@bandit.lilotux.net
# Date 1127410033 -7200
# Node ID d8ddb26b9c14324972ed240be2eaa49198ad678c
# Parent  285dea1f1937b2338d505db91d7b85ebc2cbf3f8# Parent  3741142ed9e74d7f7838625eff7eefef46d67bb6
Merge with myself

diff -r 3741142ed9e7 -r d8ddb26b9c14 .hgignore
--- a/.hgignore	Wed Sep 21 22:44:10 2005 +0200
+++ b/.hgignore	Thu Sep 22 19:27:13 2005 +0200
@@ -1,24 +1,26 @@
-(^|/)\.svn($|/)
-(^|/)\.hg($|/)
+syntax: glob
 
-(^|/)autom4te\.cache($|/)
-(^|/)\.deps($|/)
-(^|/)Makefile\.in$
-\.o$
-\.a$
-\.sw.$
+Makefile
+Makefile.in
+*.[oa]
+.deps
+mcabber/src/mcabber
 
-^mcabber/lastchange$
-/cscope.out$
-^mcabber/src/mcabber$
-(^|/)Makefile$
-(^|/)config\.(h(\.in|)|log|cache|guess|status)$
-^mcabber/aclocal.m4$
-^mcabber/config.sub$
-^mcabber/configure$
-^mcabber/connwrap/depcomp$
-^mcabber/depcomp$
-^mcabber/ltmain.sh$
-^mcabber/missing$
-^mcabber/mkinstalldirs$
-^mcabber/stamp-h
+autom4te.cache
+mcabber/aclocal.m4
+mcabber/config.sub
+mcabber/configure
+mcabber/connwrap/depcomp
+mcabber/depcomp
+mcabber/ltmain.sh
+mcabber/missing
+mcabber/mkinstalldirs
+mcabber/stamp-h1
+
+config.h{.in,}
+config.{log,cache,guess,status}
+
+*.sw?
+cscope.out
+mcabber/lastchange
+