From 917901e8e33438c425aef50a0a7417f32d77b760 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Nov 2009 00:27:55 +0000
Subject: merged unicode branch (r1931) into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 DisplayChanges.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'DisplayChanges.patch')

diff --git a/DisplayChanges.patch b/DisplayChanges.patch
index c22be897..9cb00a18 100644
--- a/DisplayChanges.patch
+++ b/DisplayChanges.patch
@@ -1,8 +1,8 @@
-Index: src/menu/UDisplay.pas
-===================================================================
---- src/menu/UDisplay.pas	(revision 1702)
-+++ src/menu/UDisplay.pas	(working copy)
-@@ -42,8 +42,65 @@
+Index: src/menu/UDisplay.pas
+===================================================================
+--- src/menu/UDisplay.pas	(revision 1702)
++++ src/menu/UDisplay.pas	(working copy)
+@@ -42,8 +42,65 @@
    SysUtils;
  
  type
@@ -68,7 +68,7 @@ Index: src/menu/UDisplay.pas
        //fade-to-black-hack
        BlackScreen: boolean;
  
-@@ -53,7 +110,7 @@
+@@ -53,7 +110,7 @@
        LastFadeTime:  cardinal; // last fade update time
  
        FadeTex:       array[1..2] of GLuint;
@@ -77,7 +77,7 @@ Index: src/menu/UDisplay.pas
        FPSCounter:    cardinal;
        LastFPS:       cardinal;
        NextFPSSwap:   cardinal;
-@@ -78,7 +135,7 @@
+@@ -78,7 +135,7 @@
        procedure SaveScreenShot;
  
        function  Draw: boolean;
-- 
cgit v1.2.3