pvalena / rpms / ruby

Forked from rpms/ruby 6 years ago
Clone

5ef0511 Merge branch 'private-ruby-2.1' into master

Merged and Committed by vondruch 10 years ago
    Merge branch 'private-ruby-2.1' into master
    
    Conflicts:
    	.gitignore
    	ruby.spec
    	rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch
    	rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
    	sources
    
        
file modified
+29 -2
ruby-2.1.0-always-use-i386.patch ruby-1.9.3-always-use-i386.patch
file renamed
+6 -6
ruby-2.1.0-custom-rubygems-location.patch ruby-1.9.3-custom-rubygems-location.patch
file renamed
+47 -35
file modified
+94 -89
file added
+3
file added
+36
file added
+81