merged master onto senslab2, manually solved conflicts in setup.py

[sfa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7936166..7e5b62e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,15 @@ build/*
 TAGS
 *~
 /sfa/util/version.py
-*.version
+wsdl/*.wsdl
+wsdl/*.xml
+wsdl/[ars]*.html
+sfa/client/*.version
 *.png
 *.svg
 *.out
+*.pdf
+*.pkey
+*.cert
+*.cred
+.DS_Store