updated with remote

pull/78/head
Malte Deiseroth 2015-09-22 12:18:00 +02:00
commit 3829abbd2d
1 changed files with 2 additions and 1 deletions

3
.gitignore vendored
View File

@ -66,11 +66,12 @@ nosetests.xml
.project .project
.pydevproject .pydevproject
.python-version
# emacs auto backups # emacs auto backups
*~ *~
*# *#
*.orig *.orig
.python-version
# venv stuff # venv stuff
pyvenv.cfg pyvenv.cfg