Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk ...

A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434

2012-01-08 16:01:12 +00:00

..

default.nix

* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing

2011-12-12 14:02:12 +00:00

gas220.patch

Porting changes from stdenv-updates into this branch.

2009-11-08 00:32:12 +00:00

guruplug-file-systems.patch

U-Boot: Fix the environment address for the GuruPlug.

2010-10-07 07:29:12 +00:00

guruplug-usb-msd-multi-lun.patch

Add U-Boot for the GuruPlug.

2010-10-04 22:23:57 +00:00

guruplug.nix

* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing

2011-12-12 14:02:12 +00:00

nanonote.nix

svn merge ^/nixpkgs/trunk

2012-01-08 16:01:12 +00:00

sheevaplug.nix

* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing

2011-12-12 14:02:12 +00:00