summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2013-04-10 09:37:09 +0200
committerTreeve Jelbert2013-04-13 10:50:10 +0200
commit0dd0ad1421456c6f915f57aa9569087a25ea8724 (patch)
treee8f0a950d826feb4dd5b8f9087f09c100a740992
parentcd603039c214489e3737e5ad43cbbc1b814321a2 (diff)
ruby-enterprise-edition - conflicts ruby-2.0
-rwxr-xr-xruby-raa/ruby-enterprise-edition/CONFLICTS1
-rw-r--r--ruby-raa/ruby-enterprise-edition/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-enterprise-edition/CONFLICTS b/ruby-raa/ruby-enterprise-edition/CONFLICTS
index bfec4b6f1b..71e229ee2a 100755
--- a/ruby-raa/ruby-enterprise-edition/CONFLICTS
+++ b/ruby-raa/ruby-enterprise-edition/CONFLICTS
@@ -1,3 +1,4 @@
conflicts ruby y
conflicts ruby-1.8
conflicts ruby-1.9
+conflicts ruby-2.0
diff --git a/ruby-raa/ruby-enterprise-edition/HISTORY b/ruby-raa/ruby-enterprise-edition/HISTORY
index c77d62f1d9..e48af3b302 100644
--- a/ruby-raa/ruby-enterprise-edition/HISTORY
+++ b/ruby-raa/ruby-enterprise-edition/HISTORY
@@ -1,2 +1,5 @@
+2013-04-10 Treeve Jelbert <treeve@sourcemage.org>
+ * CONFLICTS: add ruby-2.0
+
2012-05-12 David Kowis <dkowis@shlrm.org>
* BUILD,DETAILS,CONFIGURE,CONFLICTS,DEPENDS,PROVIDES: Created new spell for ruby-enterprise-edition