mozilla-central: changeset 247729:40affb6a994fa352630bfa51772d27412ba849e9

author	David Major <dmajor@mozilla.com>
	Fri, 05 Jun 2015 11:49:00 -0400
changeset 247729	40affb6a994fa352630bfa51772d27412ba849e9
parent 247728	65c5e6a29c060eeb0b6e49bece02ae85266bfec9
child 247730	9dc9aa49c0dab54a39321a6b764bab7cb15a3721
push id	28881
push user	kwierso@gmail.com
push date	Wed, 10 Jun 2015 01:59:03 +0000
treeherder	mozilla-central@d9156ad9b7a2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bsmedberg
bugs	763395
milestone	41.0a1
first release with	nightly linux32 5787d784485e / 41.0a1 / 20150610030209 / files nightly linux64 5787d784485e / 41.0a1 / 20150610030209 / files nightly mac 5787d784485e / 41.0a1 / 20150610030209 / files nightly win32 5787d784485e / 41.0a1 / 20150610030209 / files nightly win64 5787d784485e / 41.0a1 / 20150610030209 / files
last release without	nightly linux32 e10e2e8d8bf2 / 41.0a1 / 20150609081916 / files nightly linux64 e10e2e8d8bf2 / 41.0a1 / 20150609081916 / files nightly mac e10e2e8d8bf2 / 41.0a1 / 20150609081916 / files nightly win32 e10e2e8d8bf2 / 41.0a1 / 20150609081916 / files nightly win64 4700d1cdf489 / 41.0a1 / 20150608030201 / files

--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -170,16 +170,19 @@ static DllBlockInfo sWindowsDllBlocklist
   { "rndlmainbrowserrecordplugin.dll", ALL_VERSIONS },
 
   // Crashes with CyberLink YouCam, bug 1136968
   { "ycwebcamerasource.ax", MAKE_VERSION(2, 0, 0, 1611) },
 
   // Old version of WebcamMax crashes WebRTC, bug 1130061
   { "vwcsource.ax", MAKE_VERSION(1, 5, 0, 0) },
 
+  // NetOp School, discontinued product, bug 763395
+  { "nlsp.dll", MAKE_VERSION(6, 23, 2012, 19) },
+
   { nullptr, 0 }
 };
 
 #ifndef STATUS_DLL_NOT_FOUND
 #define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135L)
 #endif
 
 // define this for very verbose dll load debug spew