Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
applications	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
build-support	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
data	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
desktops	kde4: unify used libcanberra	2013-07-05 14:45:44 +02:00
development	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
games	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
lib	Doh	2013-07-03 16:35:13 +02:00
misc	keep lcms versioning in all-packages.nix	2013-07-01 07:52:13 +02:00
os-specific	linux-3.10: forward-port 9p speedup from 3.9	2013-07-07 22:50:12 +02:00
servers	apacheHttpd_2_4: fix build on darwin	2013-07-07 13:46:43 +02:00
shells
stdenv	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
test
tools	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
top-level	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00