From: Rudolf Polzer Date: Tue, 7 Sep 2010 17:50:14 +0000 (+0200) Subject: Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent... X-Git-Tag: xonotic-v0.1.0preview~125^2~42 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f3922b7a08f53c82092930237c249064ed47ecaf;hp=13a74ed2c1aab7221c7512e3040966bc47b6ca42 Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent/crypto2 --- diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib index 613e8b6f..f7c1abbf 100755 Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib differ diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib index e05c3c9f..1795fe7f 100755 Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib and b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib differ diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id.0.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id.0.dylib index 613e8b6f..f7c1abbf 100755 Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id.0.dylib and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id.0.dylib differ diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib index e05c3c9f..1795fe7f 100755 Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib and b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael.0.dylib differ