nixpkgs/pkgs/applications/version-management/git-and-tools/git
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
..
default.nix Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
docbook2texi.patch git: Update to 1.8.4 2013-09-30 17:19:06 +02:00
symlinks-in-bin.patch