nixpkgs/pkgs/development/libraries/libgcrypt
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
..
default.nix Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-13 17:12:43 +04:00
git.nix Adding gnunet-svn and libgcrypt-git. 2013-05-27 23:35:34 +02:00