Tuomas Tynkkynen 8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master		2016-11-30 00:34:23 +02:00
..
applications	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
build-support	stdenv moveToOutput: move even broken symlinks	2016-11-26 12:32:15 +01:00
data	xits-math: build from source	2016-11-24 01:17:54 +03:00
desktops	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
development	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
games	rogue: Add alternative source archive URLs.	2016-11-26 19:24:01 +00:00
misc	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
os-specific	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
servers	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
shells	oh-my-zsh: 2016-11-03 -> 2016-11-16	2016-11-19 20:57:54 -05:00
stdenv	allowUnfree: mention the solution that works for nix-shell as well	2016-11-16 15:14:19 +01:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00
top-level	Merge remote-tracking branch 'upstream/staging' into master	2016-11-30 00:34:23 +02:00