nixpkgs/nixos/doc
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
..
config-examples Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
manual Merge remote-tracking branch 'origin/master' into staging 2014-07-22 11:00:00 +02:00