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

[monky] / .gitignore

diff --git a/.gitignore b/.gitignore
index 080950f..5f2fe07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,15 @@ 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
@@ -46,3 +54,5 @@ doc/*.mxml
 patches/
 doc/conky.1
 README
+\r
+*.bak
\ No newline at end of file