Merge branch 'master' into gstreamer
This commit is contained in:
commit
4efddadd3c
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,7 +1,6 @@
|
||||
*.pyc
|
||||
*.swp
|
||||
.coverage
|
||||
.idea
|
||||
.noseids
|
||||
MANIFEST
|
||||
build/
|
||||
@ -10,6 +9,3 @@ coverage.xml
|
||||
dist/
|
||||
docs/_build/
|
||||
nosetests.xml
|
||||
pip-log.txt
|
||||
src/
|
||||
tmp/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user