Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
darwin	Clean up command-line tools a bit to allow us to use an impure	2014-10-04 20:21:15 +01:00
gnu
linux	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
windows