Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

[quix0rs-gnu-social.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 38e2fb33a254825abd8450ac27dcc3c4f7de1de3..f2e96d3eb662e89c5938a74382846233c3544726 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,12 @@
-^avatar/*
-^files/*
+avatar/*
+files/*
+_darcs/*
 config.php
 .htaccess
+*.tmproj
+dataobject.ini
+*~
+*.bak
+*.orig
+*.rej
+.#*