From 9f62b7ba60b594352740a67a69724dcd8a39c298 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 14:49:52 +0000
Subject: some merge fixes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1856 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/screens/UScreenSingModi.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'unicode/src/screens/UScreenSingModi.pas')

diff --git a/unicode/src/screens/UScreenSingModi.pas b/unicode/src/screens/UScreenSingModi.pas
index fbebe1ec..3ae5b7dc 100644
--- a/unicode/src/screens/UScreenSingModi.pas
+++ b/unicode/src/screens/UScreenSingModi.pas
@@ -64,7 +64,7 @@ type
       constructor Create; override;
       procedure onShow; override;
       //procedure onShowFinish; override;
-      function ParseInput(PressedKey: cCardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
       function Draw: boolean; override;
       procedure Finish; override;
   end;
-- 
cgit v1.2.3