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
doc	Synchronized stdenv-updates branch with trunk.	2011-10-06 09:37:22 +00:00
maintainers	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
pkgs	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +00:00
COPYING
default.nix
STABLE
TODO.txt	HAL and PolicyKit will be removed in trunk, see https://nixos.org/wiki/Deprecated_packages	2012-01-05 11:15:40 +00:00
VERSION	* Bump the version.	2010-02-08 09:23:03 +00:00