Carles Pagès d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland ...

Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix

2013-02-18 20:15:59 +01:00

..

default.nix

Merge remote-tracking branch 'upstream/x-updates' into wayland

2013-02-18 20:15:59 +01:00