mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 01:20:40 +00:00
a3403e6828
renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661 |
||
---|---|---|
.. | ||
unichrome | ||
builder.sh | ||
default.nix | ||
extra.list | ||
generate-expr-from-tarballs.pl | ||
imake.patch | ||
imake.sh | ||
old.list | ||
overrides.nix | ||
replacements.nix | ||
tarballs-7.5.list | ||
xorgserver-dri-path.patch | ||
xorgserver-xkbcomp-path.patch | ||
xorgserver.sh |