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
..
applications	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00
build-support	Adding ZPAQ archiver	2013-03-09 16:33:14 +04:00
data	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
desktops	xfce4-power-manager: update this forgotten package	2013-03-09 22:30:06 +01:00
development	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00
games	vdrift: update and fix	2013-03-09 14:59:39 +01:00
lib	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
misc	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
os-specific	Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs	2013-03-08 18:00:16 -05:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	Enable __ignoreNulls globally	2013-03-07 19:42:01 +01:00
test
tools	netpbm: update and attempt to fix i686 build	2013-03-09 14:59:39 +01:00
top-level	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00