summaryrefslogtreecommitdiffstats
path: root/xorg-data/xbitmaps
diff options
context:
space:
mode:
authorEric Sandall2008-03-18 00:13:23 -0700
committerEric Sandall2008-03-18 00:13:23 -0700
commit86e621269214fc6532fbe4378a552a710f57c7cb (patch)
tree56f2b1b60623373489320ce248bdd372d4453bab /xorg-data/xbitmaps
parent479f0daa97bd67044ed2031a9346ffeee1952091 (diff)
xbitmaps: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-data/xbitmaps')
-rwxr-xr-xxorg-data/xbitmaps/CONFLICTS2
-rw-r--r--xorg-data/xbitmaps/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-data/xbitmaps/CONFLICTS b/xorg-data/xbitmaps/CONFLICTS
index 5d1493e9a0..8007c92eb4 100755
--- a/xorg-data/xbitmaps/CONFLICTS
+++ b/xorg-data/xbitmaps/CONFLICTS
@@ -3,4 +3,4 @@ conflicts xfree86-devel y
conflicts xfree86-libs y
conflicts xfree86-4.3 y
conflicts xfree86 y
-conflicts xorg
+conflicts xorg y
diff --git a/xorg-data/xbitmaps/HISTORY b/xorg-data/xbitmaps/HISTORY
index 1e7e60fbc0..e18ad632c6 100644
--- a/xorg-data/xbitmaps/HISTORY
+++ b/xorg-data/xbitmaps/HISTORY
@@ -1,3 +1,6 @@
+2008-03-17 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
2008-03-16 Eric Sandall <sandalle@sourcemage.org>
* CONFLICTS: Auto-conflicts with all prior monolithic X providers