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

[sfa.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 302bd96..7e5b62e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,18 @@
+.gitignore
 build/*
-*.pyc
\ No newline at end of file
+*.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