summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-11-20 14:18:19 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-11-20 14:18:19 +0000
commit5a35bb644903e850fb539710f9b20361e167cc98 (patch)
treea62aef84378ef0b03320ae32a9837891e7460a81
parent307880dfd4a986fa690c56aa3ebc9dccc152fc40 (diff)
downloadpykolab-5a35bb644903e850fb539710f9b20361e167cc98.tar.gz
Ignore *.orig and *.rej
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index dab7375..7c1de8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,10 @@ Makefile.in
*~
*.kate-swp
*.log
+*.orig
*.pyc
*.pyo
+*.rej
*.spec
*.tar.gz
aclocal.m4