last commit i forgot to save changes in x11.c ; this fixes that file

[monky] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8ae131e..5f2fe07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache/
+compile
 config.guess
 config.log
 config.status
@@ -16,6 +17,12 @@ depcomp
 install-sh
 libtool
 ltmain.sh
+lua/.deps/
+lua/.libs/
+lua/*.c
+lua/*.la
+lua/*.lo
+lua/*.o
 m4/libtool.m4
 m4/ltoptions.m4
 m4/ltsugar.m4
@@ -27,12 +34,25 @@ src/conky
 src/stamp-h1
 src/.deps/
 src/build.h
+.cproject
+.project
+.settings*/
+*.Po
+*.o
+*.ex
+*.EX
 src/config.h
+.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
 src/defconfig.h
 src/*.o
+src/*.gcda
+src/*.gcno
+src/*.gcov
 conky-*.tar.*
 doc/*.html
 doc/*.mxml
 patches/
-README
 doc/conky.1
+README
+\r
+*.bak
\ No newline at end of file