ICAL: add conflict handling

[citadel.git] / webcit / .gitignore

diff --git a/webcit/.gitignore b/webcit/.gitignore
index 71f4f0cdb016ede9ab05f4252f8b8191593083b6..2be77a2f282fe9c78f6dda262b9cb7abe2415447 100644 (file)
--- a/webcit/.gitignore
+++ b/webcit/.gitignore
@@ -1,2 +1,23 @@
 *.d
-*.d
+*.o
+Make_modules
+Make_sources
+Makefile
+aclocal.m4
+build-stamp
+config.log
+config.status
+configure
+configure-stamp
+ical_maps.c
+locale/
+modules_init.c
+modules_init.h
+po/Makefile
+setup
+sysdep.h
+sysdep.h.in
+webcit
+i18n_templatelist.c
+autom4te.cache
+gmon.out