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
..
configurable.nix	vim: Add syntax on and set nocompatible by default	2014-07-15 14:59:16 +02:00
default.nix	vim: Update vim to 7.4.335	2014-07-15 14:59:16 +02:00
ft-nix-support.patch
macvim.nix
macvim.patch
python_framework.patch
qvim.nix