diff options
| author | Eric Sandall | 2010-04-06 19:39:41 -0700 |
|---|---|---|
| committer | Eric Sandall | 2010-04-06 19:39:41 -0700 |
| commit | 4d8cc8163af96db03ea904884bac50e5a30e87b4 (patch) | |
| tree | 320dc20c1adc3c7c73ca945a05d6c1cb810ee6aa /xorg-util | |
| parent | 52f50bd935925f55929f08552258754ac1e2a11e (diff) | |
| parent | c201de6aed0e1080683b79eae95813f545aa653e (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
Diffstat (limited to 'xorg-util')
| -rwxr-xr-x | xorg-util/gccmakedep/CONFLICTS | 6 | ||||
| -rwxr-xr-x | xorg-util/imake/CONFLICTS | 6 | ||||
| -rwxr-xr-x | xorg-util/lndir/CONFLICTS | 6 | ||||
| -rwxr-xr-x | xorg-util/makedepend/CONFLICTS | 6 | ||||
| -rwxr-xr-x | xorg-util/xorg-cf-files/CONFLICTS | 6 | ||||
| -rwxr-xr-x | xorg-util/xorg-utils/CONFLICTS | 6 |
6 files changed, 0 insertions, 36 deletions
diff --git a/xorg-util/gccmakedep/CONFLICTS b/xorg-util/gccmakedep/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/gccmakedep/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/imake/CONFLICTS b/xorg-util/imake/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/imake/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/lndir/CONFLICTS b/xorg-util/lndir/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/lndir/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/makedepend/CONFLICTS b/xorg-util/makedepend/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/makedepend/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/xorg-cf-files/CONFLICTS b/xorg-util/xorg-cf-files/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/xorg-cf-files/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/xorg-utils/CONFLICTS b/xorg-util/xorg-utils/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/xorg-utils/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y |