obadz b74793bd1c Merge branch 'master' into staging ... Conflicts: pkgs/tools/system/facter/default.nix		2016-08-29 12:44:17 +01:00
..
applications	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00
build-support	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00
data	oxygenfonts: minor cleanups	2016-08-28 21:18:10 +02:00
desktops	Merge branch 'master' into staging	2016-08-28 12:20:59 +01:00
development	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00
games	liquidwar5: disable format hardening	2016-08-28 14:06:55 +00:00
misc	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
os-specific	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00
servers	xorg.xf86videoxgi: add patch to fix build	2016-08-29 08:25:12 +00:00
shells	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
stdenv	Merge remote-tracking branch 'upstream/master' into staging	2016-08-29 00:24:47 +00:00
test
tools	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00
top-level	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00