Vladimír Čunát 2d0893088f Merge branch 'master' into staging		2016-01-15 13:43:57 +01:00
..
applications	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00
build-support	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00
data	source-code-pro: use fetchFromGitHub to fix hash	2016-01-14 08:53:03 +01:00
desktops	cinnamon: remove dead packages	2016-01-14 23:55:47 +01:00
development	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00
games	steam: propagate runtime-wrapped flags for more convenient overrides	2016-01-15 15:01:55 +03:00
misc	phantomjs2: build on darwin	2016-01-12 21:52:49 -08:00
os-specific	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00
servers	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00
shells
stdenv
test
tools	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00
top-level	Merge branch 'master' into staging	2016-01-15 13:43:57 +01:00