Yury G. Kudryashov 900c6e18cd svn merge ^/nixpkgs/trunk ... Conflicts: openssl, libplist svn path=/nixpkgs/branches/stdenv-updates/; revision=31337		2012-01-06 01:07:45 +00:00
..
docs
scripts	svn merge ^/nixpkgs/trunk	2012-01-06 01:07:45 +00:00