From 0b8629ada4293370d220bbb7e6c195c711baee7d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 16 Apr 2010 15:34:33 +0000
Subject: svn merge -r534:HEAD ^/branches/released .

---
 xorg-server/hw/xquartz/X11Controller.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'xorg-server/hw/xquartz/X11Controller.h')

diff --git a/xorg-server/hw/xquartz/X11Controller.h b/xorg-server/hw/xquartz/X11Controller.h
index 9e16f75ce..65a09b8d5 100644
--- a/xorg-server/hw/xquartz/X11Controller.h
+++ b/xorg-server/hw/xquartz/X11Controller.h
@@ -55,10 +55,9 @@ typedef unsigned int NSUInteger;
 #endif
 #endif
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-@interface X11Controller : NSObject <NSTableViewDataSource>
-#else
 @interface X11Controller : NSObject
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+<NSTableViewDataSource>
 #endif
 {
     IBOutlet NSPanel *prefs_panel;
@@ -69,6 +68,7 @@ typedef unsigned int NSUInteger;
     IBOutlet NSButton *use_sysbeep;
     IBOutlet NSButton *enable_keyequivs;
     IBOutlet NSButton *sync_keymap;
+    IBOutlet NSButton *option_sends_alt;
     IBOutlet NSButton *click_through;
     IBOutlet NSButton *focus_follows_mouse;
     IBOutlet NSButton *focus_on_new_window;
-- 
cgit v1.2.3