Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
configurable.nix	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
default.nix	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
ft-nix-support.patch
macvim.nix	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
macvim.patch	add MacVim	2014-06-07 15:26:01 -04:00
python_framework.patch	update vim to v7.4.316	2014-06-01 21:09:55 -04:00
qvim.nix
wrapper.nix