Vladimír Čunát b5e89fe9bf Merge branch 'master' into staging		2016-11-15 00:20:19 +01:00
..
applications	Merge branch 'master' into staging	2016-11-15 00:20:19 +01:00
build-support	singularity: init 2.2	2016-11-15 09:11:53 +11:00
data	google-fonts: Add a check to ensure that there are no duplicate font names	2016-11-14 17:35:35 +01:00
desktops	Merge branch 'master' into staging	2016-11-15 00:20:19 +01:00
development	Merge branch 'master' into staging	2016-11-15 00:20:19 +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-15 00:20:19 +01:00
servers	Merge branch 'master' into staging	2016-11-15 00:20:19 +01:00
shells	oh-my-zsh: 2016-10-25 -> 2016-11-03	2016-11-09 19:57:32 -05:00
stdenv	top-level: Make cross compiling slightly saner	2016-11-12 20:20:44 +01:00
test
tools	Merge branch 'master' into staging	2016-11-15 00:20:19 +01:00
top-level	Merge branch 'master' into staging	2016-11-15 00:20:19 +01:00