Merge remote-tracking branch 'origin/released'

* origin/released:
  xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Conflicts:
	mesalib/src/glsl/glcpp/glcpp.c
	openssl/Makefile

1 files changed, 97 insertions, 97 deletions

diff --git a/openssl/ms/testencce.bat b/openssl/ms/testencce.bat
index 04faa5d99..1da3e0861 100644
--- a/openssl/ms/testencce.bat
+++ b/openssl/ms/testencce.bat
@@ -1,97 +1,97 @@
-@echo off

-echo start testenc

-

-path=..\ms;%path%

-set ssleay=%1%

-copy ..\ms\testenc.bat >nul

-set input=testenc.bat

-set tmp1=cipher.out

-set out1=clear.out

-set cmp=perl ..\ms\cmp.pl

-

-cecopy %ssleay% CE:\OpenSSL

-

-cd

-call tencce.bat enc

-if errorlevel 1 goto err

-

-call tencce.bat rc4

-if errorlevel 1 goto err

-

-call tencce.bat des-cfb

-if errorlevel 1 goto err

-

-call tencce.bat des-ede-cfb

-if errorlevel 1 goto err

-

-call tencce.bat des-ede3-cfb

-if errorlevel 1 goto err

-

-call tencce.bat des-ofb

-if errorlevel 1 goto err

-

-call tencce.bat des-ede-ofb

-if errorlevel 1 goto err

-

-call tencce.bat des-ede3-ofb

-if errorlevel 1 goto err

-

-call tencce.bat des-ecb

-if errorlevel 1 goto err

-

-call tencce.bat des-ede

-if errorlevel 1 goto err

-

-call tencce.bat des-ede3

-if errorlevel 1 goto err

-

-call tencce.bat des-cbc

-if errorlevel 1 goto err

-

-call tencce.bat des-ede-cbc

-if errorlevel 1 goto err

-

-call tencce.bat des-ede3-cbc

-if errorlevel 1 goto err

-

-call tencce.bat idea-ecb

-if errorlevel 1 goto err

-

-call tencce.bat idea-cfb

-if errorlevel 1 goto err

-

-call tencce.bat idea-ofb

-if errorlevel 1 goto err

-

-call tencce.bat idea-cbc

-if errorlevel 1 goto err

-

-call tencce.bat rc2-ecb

-if errorlevel 1 goto err

-

-call tencce.bat rc2-cfb

-if errorlevel 1 goto err

-

-call tencce.bat rc2-ofb

-if errorlevel 1 goto err

-

-call tencce.bat rc2-cbc

-if errorlevel 1 goto err

-

-call tencce.bat bf-ecb

-if errorlevel 1 goto err

-

-call tencce.bat bf-cfb

-if errorlevel 1 goto err

-

-call tencce.bat bf-ofb

-if errorlevel 1 goto err

-

-call tencce.bat bf-cbc

-if errorlevel 1 goto err

-

-echo OK

-del %out1% >nul 2>&1

-del %tmp1% >nul 2>&1

-:err

-

+@echo off
+echo start testenc
+
+path=..\ms;%path%
+set ssleay=%1%
+copy ..\ms\testenc.bat >nul
+set input=testenc.bat
+set tmp1=cipher.out
+set out1=clear.out
+set cmp=perl ..\ms\cmp.pl
+
+cecopy %ssleay% CE:\OpenSSL
+
+cd
+call tencce.bat enc
+if errorlevel 1 goto err
+
+call tencce.bat rc4
+if errorlevel 1 goto err
+
+call tencce.bat des-cfb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede-cfb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3-cfb
+if errorlevel 1 goto err
+
+call tencce.bat des-ofb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede-ofb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3-ofb
+if errorlevel 1 goto err
+
+call tencce.bat des-ecb
+if errorlevel 1 goto err
+
+call tencce.bat des-ede
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3
+if errorlevel 1 goto err
+
+call tencce.bat des-cbc
+if errorlevel 1 goto err
+
+call tencce.bat des-ede-cbc
+if errorlevel 1 goto err
+
+call tencce.bat des-ede3-cbc
+if errorlevel 1 goto err
+
+call tencce.bat idea-ecb
+if errorlevel 1 goto err
+
+call tencce.bat idea-cfb
+if errorlevel 1 goto err
+
+call tencce.bat idea-ofb
+if errorlevel 1 goto err
+
+call tencce.bat idea-cbc
+if errorlevel 1 goto err
+
+call tencce.bat rc2-ecb
+if errorlevel 1 goto err
+
+call tencce.bat rc2-cfb
+if errorlevel 1 goto err
+
+call tencce.bat rc2-ofb
+if errorlevel 1 goto err
+
+call tencce.bat rc2-cbc
+if errorlevel 1 goto err
+
+call tencce.bat bf-ecb
+if errorlevel 1 goto err
+
+call tencce.bat bf-cfb
+if errorlevel 1 goto err
+
+call tencce.bat bf-ofb
+if errorlevel 1 goto err
+
+call tencce.bat bf-cbc
+if errorlevel 1 goto err
+
+echo OK
+del %out1% >nul 2>&1
+del %tmp1% >nul 2>&1
+:err
+