diff options
| author | Eric Sandall | 2008-03-18 00:13:24 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:13:24 -0700 |
| commit | 52e3fcd064799bc401a3ea5cd8292b9d4d4c4a3e (patch) | |
| tree | 165bebe5e1cfbbfe819f62d249df16655743b54c /xorg-data/xcursor-themes | |
| parent | 86e621269214fc6532fbe4378a552a710f57c7cb (diff) | |
xcursor-themes: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-data/xcursor-themes')
| -rwxr-xr-x | xorg-data/xcursor-themes/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-data/xcursor-themes/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-data/xcursor-themes/CONFLICTS b/xorg-data/xcursor-themes/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-data/xcursor-themes/CONFLICTS +++ b/xorg-data/xcursor-themes/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/xcursor-themes/HISTORY b/xorg-data/xcursor-themes/HISTORY index 4f2b61b0a5..679687c72e 100644 --- a/xorg-data/xcursor-themes/HISTORY +++ b/xorg-data/xcursor-themes/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 |