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/quartzCommon.h | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/xorg-server/hw/xquartz/quartzCommon.h b/xorg-server/hw/xquartz/quartzCommon.h
index 1c0eeba9c..8ab70f22a 100644
--- a/xorg-server/hw/xquartz/quartzCommon.h
+++ b/xorg-server/hw/xquartz/quartzCommon.h
@@ -60,6 +60,7 @@ extern int              focusOnNewWindow;
 extern int              quartzUseAGL;
 extern int              quartzEnableKeyEquivalents;
 extern int              quartzFullscreenDisableHotkeys;
+extern int              quartzOptionSendsAlt;
 
 // Other shared data
 extern int              quartzServerVisible;
-- 
cgit v1.2.3