Merge branch 'master' into gstreamer

This commit is contained in:
Thomas Adamcik 2010-04-06 17:39:13 +02:00
commit 4efddadd3c

4
.gitignore vendored
View File

@ -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/