Oops - fix total idiocies in applying that patch

git-svn-id: svn://svn.tartarus.org/sgt/putty@329 cda61777-01e9-0310-a592-d414129be87e

diff --git a/putty.h b/putty.h
index 477a81e..f4944aa 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -69,7 +69,7 @@ typedef enum {
     US_NONE = 0, US_KEY = 1, US_DISP = 2, US_BOTH = 3
 } Unscroll_Trigger;
 
-GLOBAL Unscroll_trigger unscroll_event;
+GLOBAL Unscroll_Trigger unscroll_event;
 
 #define WM_NETEVENT  (WM_USER + 1)
 

diff --git a/terminal.c b/terminal.c
index ab6ffd0..444f243 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1,4 +1,3 @@
-++ terminal.c.new      Mon Nov 22 15:02:03 1999
 #include <windows.h>
 
 #include <stdio.h>