diff options
| author | Treeve Jelbert | 2013-04-10 09:34:30 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2013-04-13 10:50:09 +0200 |
| commit | 9984993d0ea57a21a8cb8d44dfb9eefe7c90944a (patch) | |
| tree | aa7ffe243771eae3383f6f521f08c3b369be213f | |
| parent | ae81924ca474938b745caed11f08e5551f4b7c5d (diff) | |
ruby-1.8 - conflicts ruby-2.0
| -rwxr-xr-x | ruby-raa/ruby-1.8/CONFLICTS | 1 | ||||
| -rw-r--r-- | ruby-raa/ruby-1.8/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-1.8/CONFLICTS b/ruby-raa/ruby-1.8/CONFLICTS index c9a3c7fa3a..75d7b2ee35 100755 --- a/ruby-raa/ruby-1.8/CONFLICTS +++ b/ruby-raa/ruby-1.8/CONFLICTS @@ -1,3 +1,4 @@ conflicts ruby y conflicts ruby-1.9 +conflicts ruby-2.0 conflicts ruby-enterprise-edition diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY index 059a7154cb..4708f7b040 100644 --- a/ruby-raa/ruby-1.8/HISTORY +++ b/ruby-raa/ruby-1.8/HISTORY @@ -1,3 +1,6 @@ +2013-04-10 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add ruby-2.0 + 2013-01-08 Eric Sandall <sandalle@sourcemage.org> * PRE_BUILD: Apply stdout-rouge-fix.patch * stdout-rouge-fix.patch: Fix glibc 2.14+ compilation |