summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Johnson2009-08-18 02:35:35 -0500
committerDon Johnson2009-08-18 02:35:35 -0500
commit3e06b3e7cccb18e87de8061a7bb907be4d46237e (patch)
tree298c4673f5030f8869353ea99a0ca789361de1b4
parent7d530e1431a568d733f6f4a4cd557ab3bb1bdb5e (diff)
Added ChangeLog entry in, and updated blender-bin for deprecation of
blender-bin in z-rejected.
-rw-r--r--ChangeLog3
-rwxr-xr-xbin-graphics/blender-bin/CONFLICTS1
-rw-r--r--bin-graphics/blender-bin/HISTORY3
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6763bd1..0e865e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-08-18 Donald Johnson <ltdonny@gmail.com>
+ * bin-graphics/blender-bin: moved spell from z-rejected
+
2009-07-21 Julien "_kaze_" ROZO <julien@rozo.org>
* accounts: added tomcat5 and tomcat55 users
* bin-http/tomcat-5-bin: new spell, an implementation of the Servlet and
diff --git a/bin-graphics/blender-bin/CONFLICTS b/bin-graphics/blender-bin/CONFLICTS
index 3b126a1..f94550e 100755
--- a/bin-graphics/blender-bin/CONFLICTS
+++ b/bin-graphics/blender-bin/CONFLICTS
@@ -1,2 +1,3 @@
+conflicts blender-bin &&
conflicts blender_cvs &&
conflicts blender
diff --git a/bin-graphics/blender-bin/HISTORY b/bin-graphics/blender-bin/HISTORY
index 2caa3fc..70f6192 100644
--- a/bin-graphics/blender-bin/HISTORY
+++ b/bin-graphics/blender-bin/HISTORY
@@ -1,3 +1,6 @@
+2009-08-18 Donald Johnson <ltdonny@gmail.com>
+ * Moved spell from z-rejected, added CONFLICTS for deprecation
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.