From e73a5742cf210e0b1325ded0b8beaa5d04683b6f Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Tue, 24 Apr 2007 18:47:00 +0000
Subject: [PATCH] merge r5883 from trunk

---
 data/rc.xml.in | 1 -
 data/rc.xsd    | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/rc.xml.in b/data/rc.xml.in
index b2c22d4d..a113fbc5 100644
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -82,7 +82,6 @@
 
 <resize>
   <drawContents>yes</drawContents>
-  <fourCorners>no</fourCorners>
   <popupShow>Nonpixel</popupShow>
   <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
   <popupPosition>Center</popupPosition>
diff --git a/data/rc.xsd b/data/rc.xsd
index 20edc160..db3069af 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -45,6 +45,8 @@
          Add font section to theme section
      Sun Mar  4 13:49:37 EST 2007 - danakj(a)orodu.net
          Removing font shadows - they are going back into the themerc
+     Tue Apr 24 18:42:24 UTC 2007 - mikachu(a)openbox.org
+         Removed fourCorners option.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://openbox.org/"
@@ -143,7 +145,6 @@
     <xs:complexType name="resize">
         <xs:sequence>
             <xs:element minOccurs="0" name="drawContents" type="ob:bool"/>
-            <xs:element minOccurs="0" name="fourCorners" type="ob:bool"/>
             <xs:element minOccurs="0" name="popupShow" type="ob:popupshow"/>
             <xs:element minOccurs="0" name="popupPosition" type="ob:popupposition"/>
         </xs:sequence>
-- 
2.34.1