projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
moved from videoscale => ffvideoscale *and* put queus before video and audio pipes
[mediagoblin.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index f5c2ba31f3eef8c7f80ecf777c0bf8dd7c1c7941..5f16bd747eca8fb796f00e045ff1cdb389351a21 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-9,8
+9,10
@@
mediagoblin.egg-info
*.pyc
*.pyo
docs/_build/
+docs/build
user_dev/
-mediagoblin_user.ini
+paste_local.ini
+mediagoblin_local.ini
server-log.txt
*~
*.swp