Carles Pagès 8de5d77e3c Merge branch 'master' into wayland ... Conflicts: pkgs/top-level/all-packages.nix		2013-03-03 11:58:28 +01:00
..
applications	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00
build-support	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00
data	minor poppler-data update	2013-01-29 14:07:30 +01:00
desktops	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00
development	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00
games	games/unvanquished: New nixpkg.	2013-02-24 18:02:53 +04:00
lib	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00
misc	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00
os-specific	Linux 3.8.1	2013-03-02 20:16:08 +04:00
servers	Merge pull request #338 from Davorak/master	2013-03-01 06:13:14 -08:00
shells	bash-completion: update to current git HEAD at 2.0-95-gd08b9f2	2013-01-30 12:25:11 +01:00
stdenv	stdenv.mkDerivation: Add meta and passthru to all outputs.	2013-03-02 08:34:53 -05:00
test
tools	virtualgl: fixing and updating to 2.3.2	2013-03-01 10:18:00 +01:00
top-level	Merge branch 'master' into wayland	2013-03-03 11:58:28 +01:00