4 Commits

Author	SHA1	Message	Date
Zachary Ware	6bd687e0f2	Merge with 3.4. ... The fix has moved in this branch. Also, the opt-in is already available on this branch; just set nasmDir when building.	2015-04-09 20:20:55 -05:00
Zachary Ware	7037cf7300	Closes #23154: Fix unnecessary recompilation of OpenSSL on Windows	2015-01-03 22:33:10 -06:00
Steve Dower	c4c79a0e82	Allows nasm to be found on the system-wide path before using the version in externals.	2014-12-12 17:15:18 -08:00
Steve Dower	65e4cb10d9	Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.	2014-11-22 12:54:57 -08:00