summaryrefslogtreecommitdiffstats
path: root/ruby-raa
diff options
context:
space:
mode:
authorVlad Glagolev2015-12-03 15:27:37 +0300
committerVlad Glagolev2015-12-03 15:27:37 +0300
commit6f3f960ac598e6de01f6cafff510a4346d037ee9 (patch)
treefc9179e336d93fdaf9207a87d7fe4692bde078b7 /ruby-raa
parent7eef35f27547593eb8fc8cbd890e37e2db554269 (diff)
ruby-1.9: conflicts rake
Diffstat (limited to 'ruby-raa')
-rwxr-xr-xruby-raa/ruby-1.9/CONFLICTS1
-rw-r--r--ruby-raa/ruby-1.9/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-1.9/CONFLICTS b/ruby-raa/ruby-1.9/CONFLICTS
index 54a7709b0f..ed2b37fed2 100755
--- a/ruby-raa/ruby-1.9/CONFLICTS
+++ b/ruby-raa/ruby-1.9/CONFLICTS
@@ -5,3 +5,4 @@ conflicts ruby-2.1
conflicts ruby-2.2
conflicts ruby-enterprise-edition
conflicts rubygems
+conflicts rake
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index a2f472019b..bcca63c801 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2015-12-03 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: conflicts with rake
+
2015-04-01 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added missing libffi dependency
* BUILD: removed obsolete pthread flag; force rubygems here