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

[sfa.git] / .gitignore

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