diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:45:39 +0200 |
| commit | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (patch) | |
| tree | 425433df36d64f529d2222de2d1680e0b0abca3f /openssl/ms | |
| parent | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (diff) | |
| parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
| download | vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.gz vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.tar.bz2 vcxsrv-7c21629fbeb51b65fd0625bb36d888587d62fd89.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/ms')
| -rwxr-xr-x | openssl/ms/do_win64a.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/ms/do_win64a.bat b/openssl/ms/do_win64a.bat index be87fffee..3182a44a9 100755 --- a/openssl/ms/do_win64a.bat +++ b/openssl/ms/do_win64a.bat @@ -1,6 +1,6 @@ perl util\mkfiles.pl >MINFO -cmd /c "nasm -f win64 -v" >NUL: 2>&1 +cmd /c "nasm -f win64 -v" >NUL 2>&1 if %errorlevel% neq 0 goto ml64 perl ms/uplink-x86_64.pl nasm > ms/uptable.asm |