# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1263337487 -3600
# Node ID 5c317e78a5ef5259379b645f9917c03e3e285122
# Parent  d5bc5610c933062c58bc5f399ba33830db821871# Parent  bfd12f8338e001ea70967def11916dd0eb406a4a
merge

diff -r d5bc5610c933 -r 5c317e78a5ef .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Jan 13 00:04:47 2010 +0100
@@ -0,0 +1,71 @@
+syntax: glob
+
+**.ko
+**.ko.cmd
+**.lo
+**.mod.c
+**.o
+**.o.cmd
+**.swp
+.tmp_versions
+ChangeLog
+Doxyfile
+Kbuild
+Makefile
+Makefile.in
+Module.markers
+Module.symvers
+TAGS
+aclocal.m4
+autoconf
+autom4te.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+devices/Kbuild
+devices/Makefile
+devices/Makefile.in
+devices/TAGS
+devices/e1000/Kbuild
+devices/e1000/Makefile
+devices/e1000/Makefile.in
+devices/modules.order
+examples/Kbuild
+examples/Makefile
+examples/Makefile.in
+examples/TAGS
+examples/mini/Kbuild
+examples/mini/Makefile
+examples/mini/Makefile.in
+examples/mini/modules.order
+examples/modules.order
+examples/rtai/Kbuild
+examples/rtai/Makefile
+examples/rtai/Makefile.in
+include/Makefile
+include/Makefile.in
+include/TAGS
+libtool
+m4/Makefile
+m4/Makefile.in
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+modules.order
+script/Makefile
+script/Makefile.in
+script/init.d/Makefile
+script/init.d/Makefile.in
+script/init.d/ethercat
+script/sysconfig/Makefile
+script/sysconfig/Makefile.in
+stamp-h1
+tool/.deps
+tool/Makefile
+tool/Makefile.in
+tool/TAGS
+tool/ethercat