summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorJim Grandy <jgrandy@authentic8.com>2013-08-22 14:56:24 -0700
committerJim Grandy <jgrandy@authentic8.com>2013-08-22 14:56:24 -0700
commitb857a69332933244838fcbcfdfe4688953d149f9 (patch)
treeb92c294ae5fb7e810d9a0e0cbce6000a0b3fe1ee /xorg
parentb3ee3cbd4bd90cd65af67de118faac17c7ee57e5 (diff)
downloadxrdp-proprietary-b857a69332933244838fcbcfdfe4688953d149f9.tar.gz
xrdp-proprietary-b857a69332933244838fcbcfdfe4688953d149f9.zip
fix merge error in xorg/X11R7.6/rdp/rdp.h
Diffstat (limited to 'xorg')
-rw-r--r--xorg/X11R7.6/rdp/rdp.h1
1 files changed, 0 insertions, 1 deletions
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;
};