summaryrefslogtreecommitdiffstats
path: root/compiz-fusion/compiz-profile
diff options
context:
space:
mode:
authorEric Sandall2009-04-17 00:06:12 -0700
committerEric Sandall2009-04-17 00:37:52 -0700
commit55101749eb884a327b5e11100ea4e474baf3b18b (patch)
tree6af9206f5716035dd1f90a7fc685b0083bd55250 /compiz-fusion/compiz-profile
parent8d51455e4f0ec1be7d4ad0d12d710319038c5efc (diff)
compiz-profile: No longer conflicts with non-existent compiz-fusion spell
Diffstat (limited to 'compiz-fusion/compiz-profile')
-rwxr-xr-xcompiz-fusion/compiz-profile/CONFLICTS1
-rw-r--r--compiz-fusion/compiz-profile/HISTORY2
2 files changed, 2 insertions, 1 deletions
diff --git a/compiz-fusion/compiz-profile/CONFLICTS b/compiz-fusion/compiz-profile/CONFLICTS
index d3341f775d..f5a8fe8b22 100755
--- a/compiz-fusion/compiz-profile/CONFLICTS
+++ b/compiz-fusion/compiz-profile/CONFLICTS
@@ -1,2 +1 @@
-conflicts compiz-fusion y
conflicts compiz-fusion-profile y
diff --git a/compiz-fusion/compiz-profile/HISTORY b/compiz-fusion/compiz-profile/HISTORY
index 3c22b64fb3..d11e38a18d 100644
--- a/compiz-fusion/compiz-profile/HISTORY
+++ b/compiz-fusion/compiz-profile/HISTORY
@@ -1,5 +1,7 @@
2009-04-16 Eric Sandall <sandalle@sourcemage.org>
* Renamed from compiz-fusion-profile
+ * CONFLICTS: No longer conflicts with compiz-fusion spell, it
+ no longer exists
2008-10-04 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 0.7.8