Skip to content
Commit 84c01850 authored by Yury G. Kudryashov's avatar Yury G. Kudryashov
Browse files

svn merge ^/nixpkgs/trunk, one simple conflict in jruby 

svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
parents 3980444b b94fef3c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment