From b857a69332933244838fcbcfdfe4688953d149f9 Mon Sep 17 00:00:00 2001
From: Jim Grandy <jgrandy@authentic8.com>
Date: Thu, 22 Aug 2013 14:56:24 -0700
Subject: [PATCH] fix merge error in xorg/X11R7.6/rdp/rdp.h

---
 xorg/X11R7.6/rdp/rdp.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h
index b059fd65..72440af9 100644
--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@@ -297,7 +297,6 @@ struct _rdpPixmapRec
      then we force remote the pixmap */
   int use_count;
   int kind_width;
-  int is_scratch;
   struct rdp_draw_item* draw_item_head;
   struct rdp_draw_item* draw_item_tail;
 };