Merge branch 'transcoding_progress'

[mediagoblin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c4a1497f20ec4cb8ed2286c730ce8ca73fe2e949..acb9a3b21a0c59dc1fab5f742635a2358f4d3e3b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
 *~
 *.swp
 *.mo
+*.patch
 
 # The legacy of buildout
 .installed.cfg
@@ -63,3 +64,4 @@ venv*
 /extlib/leaflet/
 /extlib/tinymce/
 /extlib/video.js/
+/extlib/videojs-resolution-switcher