Merged bug fix mentioned in http://casparcg.com/forum/viewtopic.php?f=3&t=2480

[casparcg] / .gitignore

diff --git a/.gitignore b/.gitignore
index 864e36ec8bbd110af2947f7d50703a19b3f5101c..a11ad1ad381d69c65a715cdb88b1c38ae743bd38 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,11 @@
 /modules/flash/tmp
 /modules/flash/flash.vcxproj.user
 
+# /modules/html/
+/modules/html/bin
+/modules/html/tmp
+/modules/html/html.vcxproj.user
+
 # /modules/image/
 /modules/image/bin
 /modules/image/tmp
@@ -60,10 +65,6 @@
 /modules/ogl/tmp
 /modules/ogl/ogl.vcxproj.user
 
-# /modules/silverlight/
-/modules/silverlight/bin
-/modules/silverlight/tmp
-
 # /protocol/
 /protocol/bin
 /protocol/tmp
@@ -81,21 +82,6 @@
 /shell/thumbnails
 /shell/tmp
 
-# /dependencies/
-/dependencies/boost
-
-# /dependencies64/ for 2.1.0 branch
-/dependencies64/asmlib
-/dependencies64/bluefish
-/dependencies64/boost
-/dependencies64/ffmpeg
-/dependencies64/freeimage
-/dependencies64/glew
-/dependencies64/media_sdk
-/dependencies64/openal
-/dependencies64/sfml
-/dependencies64/tbb
-
-/modules/portaudio/portaudio.vcxproj.user
-/modules/portaudio/bin
-/modules/portaudio/tmp
+/modules/newtek/newtek.vcxproj.user
+/modules/newtek/bin
+/modules/newtek/tmp