nixpkgs/pkgs/development/libraries/cairo
Eelco Dolstra 552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
..
1.12.2.nix cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
default.nix Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-06-25 18:42:56 +02:00