Merge branch 'master' of git://gitorious.org/laconica/mainline

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

diff --git a/.gitignore b/.gitignore
index c75c07de6c7738c246a146c29b0bdf2eb44e086e..f2e96d3eb662e89c5938a74382846233c3544726 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,10 @@ files/*
 _darcs/*
 config.php
 .htaccess
+*.tmproj
+dataobject.ini
+*~
+*.bak
+*.orig
+*.rej
+.#*