Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
builder.sh
default.nix
generate-libreoffice-srcs.sh
get-go-src.nix
go-oo.nix
go-srcs.nix
libreoffice-srcs.nix
libreoffice.nix
oo.patch
root-required.patch
xlib.patch