Domen Kožar bb4d658f64 Merge branch 'master' into staging ... Conflicts: nixos/doc/manual/release-notes/rl-unstable.xml nixos/modules/services/printing/cupsd.nix pkgs/applications/misc/calibre/default.nix pkgs/development/haskell-modules/hackage-packages.nix pkgs/development/libraries/libsodium/default.nix pkgs/misc/emulators/wine/unstable.nix pkgs/top-level/all-packages.nix		2015-05-11 10:05:23 +02:00
..
darwin	command-line-tools: Update broken URL and packages	2015-04-18 22:55:43 +02:00
gnu
linux	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
windows	libgcrypt: Massive cleanup and make 1.6 the default	2015-05-01 17:41:42 -07:00