Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
..
2013-01-22 23:23:53 +01:00
2012-07-29 20:54:45 +02:00
2013-01-19 00:02:51 +01:00
2012-09-12 12:33:03 -04:00
2012-12-28 19:20:09 +01:00
2013-02-26 01:24:32 +01:00
2013-01-16 13:59:15 -05:00
2011-10-07 12:18:17 +00:00
2011-10-27 21:45:53 +00:00
2011-10-20 18:17:37 +00:00
2011-08-10 13:05:39 +00:00