summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2004-01-17 23:02:09 +0000
committerMichael Januszewski <spock@gentoo.org>2004-01-17 23:02:09 +0000
commit925f645c861dbd8d4a0ab5e6a02178651eb6be12 (patch)
tree496dbb708e06acff71f4f72e4444f2667fa19be2 /x11-terms
parentAdded support for 2.6 kernels, fixed a few minor issues with silent mode, add... (diff)
downloadgentoo-2-925f645c861dbd8d4a0ab5e6a02178651eb6be12.tar.gz
gentoo-2-925f645c861dbd8d4a0ab5e6a02178651eb6be12.tar.bz2
gentoo-2-925f645c861dbd8d4a0ab5e6a02178651eb6be12.zip
Fixed a conflict between the borderless patch and the paste_mouse_outside patch.
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/aterm/files/aterm-0.4.2-borderless.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
index 28083c36802b..cc742c3755fe 100644
--- a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
+++ b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
@@ -81,7 +81,7 @@ diff -Bru aterm-cvs/src/rxvt.h aterm-cvs-modif/src/rxvt.h
#define Opt_scrollKeypress (1LU<<12)
#define Opt_transparent (1LU<<13)
#define Opt_transparent_sb (1LU<<14)
-+#define Opt_borderLess (1LU<<15)
++#define Opt_borderLess (1LU<<16)
/* place holder used for parsing command-line options */
#define Opt_Boolean (1LU<<31)