d5d94127fd
Minor conflicts; I hope I didn't mess up: pkgs/development/tools/misc/binutils/default.nix pkgs/games/openjk/default.nix |
||
---|---|---|
.. | ||
plugins | ||
cflags-prune.diff | ||
common.nix | ||
configurable.nix | ||
default.nix | ||
ft-nix-support.patch | ||
macvim-configurable.nix | ||
macvim.nix | ||
macvim.patch | ||
vimacs.nix |