Vladimír Čunát 5af7b82336 Merge branch 'master' into staging ... To incorporate some larger security rebuilds (jasper).		2016-11-17 11:14:05 +01:00
..
applications	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
build-support	singularity: init 2.2	2016-11-15 09:11:53 +11:00
data	pecita: 5.3 -> 5.4	2016-11-17 00:06:41 +01:00
desktops	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
development	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
games	steam: use custom openssl	2016-11-09 21:18:32 -04:00
misc	vim-utils: fix typo	2016-11-13 12:07:10 +00:00
os-specific	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
servers	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
shells	rush: 1.7 -> 1.8 (#20424)	2016-11-15 13:33:56 +00:00
stdenv	allowUnfree: mention the solution that works for nix-shell as well	2016-11-16 15:14:19 +01:00
test
tools	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00
top-level	Merge branch 'master' into staging	2016-11-17 11:14:05 +01:00