nixpkgs/pkgs/development/libraries/libdrm
Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
..
default.nix Merge remote-tracking branch 'upstream/master' into x-updates 2012-07-14 14:24:27 -04:00
libdrm-apple.patch Upgrade libdrm and mesa to the latest versions 2012-01-16 17:48:33 +00:00