Domen Kožar 505117f3fb Merge branch 'master' into staging		2015-11-11 12:53:36 +01:00
..
applications	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
build-support	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
data	Merge branch 'master.upstream' into staging.upstream	2015-11-05 10:07:28 -08:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-11-07 15:51:51 -08:00
development	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
games	fhs-env: symlink /usr/lib to libs for the main architecture	2015-11-11 00:01:02 +03:00
misc	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
os-specific	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
servers	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
shells	fish: fix use hostname from the store instead of from the environment	2015-11-06 09:55:55 +01:00
stdenv	Don't fail if env-vars cannot be written to	2015-11-04 16:32:59 +01:00
test
tools	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00
top-level	Merge branch 'master' into staging	2015-11-11 12:53:36 +01:00