Danny Wilson d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos ... Conflicts: pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/mpc/default.nix pkgs/development/libraries/mpfr/default.nix pkgs/development/libraries/ppl/default.nix pkgs/tools/misc/coreutils/default.nix		2013-03-17 13:22:24 +01:00
..
applications	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
build-support	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
data	man-pages: Update to 3.48	2013-03-08 19:49:53 -05:00
desktops	A more complete fix of cyrus-sasl update (broken KDEs).	2013-03-13 21:06:37 +01:00
development	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
games	asc: fix build for gcc47	2013-03-17 12:02:55 +01:00
lib	Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me	2013-03-08 22:59:54 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
os-specific	enable 802.11n by default.	2013-03-11 02:31:51 -07:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
test
tools	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
top-level	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00