Skip to content
Commit 50a0b55a authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs 

Update ffmpeg dependency to 0.10 in oraclejdk7
parents a46d2e31 44190ff1
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