Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland ... Conflicts: pkgs/development/libraries/mesa/default.nix pkgs/top-level/all-packages.nix		2013-03-10 18:19:49 +01:00
..
default.nix	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00