From 30fc6218084beb947e03a062be47449e6857515e Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Mon, 17 Apr 2006 03:48:36 +0000 Subject: [PATCH] cleanup prep --- Cxbx.opt | Bin 58880 -> 61952 bytes Include/Cxbx.h | 8 ++++---- Source/Win32/CxbxKrnl/EmuXapi.cpp | 2 +- Source/Win32/CxbxKrnl/HLEIntercept.cpp | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cxbx.opt b/Cxbx.opt index 3c6aca52d15cd5c5d3a14766936af21673d7a326..03aee1c77aa719d665e4f193c0f3d45add17bf6a 100644 GIT binary patch literal 61952 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 JW*|8O{|6kMFk1is literal 58880 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 gpPv7x=l|*Xe|r9(p8u!k|LOUEdj8+ %s\n", pFunc, OovpaTable[a].szFuncName); + #endif if(OovpaTable[a].lpRedirect == 0) {