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
2013-01-19 00:02:51 +01:00
2012-06-04 03:53:25 +00:00
Description
No description provided
1.5 GiB
Languages
Nix 96.3%
Shell 1.8%
Python 0.7%
Perl 0.4%
C 0.3%
Other 0.1%