diff options
| author | Treeve Jelbert | 2013-04-10 09:35:43 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2013-04-13 10:50:09 +0200 |
| commit | cd603039c214489e3737e5ad43cbbc1b814321a2 (patch) | |
| tree | bf15ec0430282216699b3ad190fc94eda24c891c | |
| parent | 9984993d0ea57a21a8cb8d44dfb9eefe7c90944a (diff) | |
ruby-1.9 - conflicts ruby-2.0
| -rwxr-xr-x | ruby-raa/ruby-1.9/CONFLICTS | 1 | ||||
| -rw-r--r-- | ruby-raa/ruby-1.9/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby-raa/ruby-1.9/CONFLICTS b/ruby-raa/ruby-1.9/CONFLICTS index ffd847b94c..786eafbef8 100755 --- a/ruby-raa/ruby-1.9/CONFLICTS +++ b/ruby-raa/ruby-1.9/CONFLICTS @@ -1,3 +1,4 @@ conflicts ruby y conflicts ruby-1.8 +conflicts ruby-2.0 conflicts ruby-enterprise-edition diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY index 1d24d27661..949dcd3115 100644 --- a/ruby-raa/ruby-1.9/HISTORY +++ b/ruby-raa/ruby-1.9/HISTORY @@ -1,3 +1,6 @@ +2013-04-10 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add ruby-2.0 + 2013-02-22 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.9.3-p392; SECURITY_PATCH++ (CVE-2013-0269) |