Kier Davis 3b7984dd51 Merge branch 'master' into ckb-update-and-cleanup		2018-11-06 00:47:14 +00:00
..
applications	jekyll: 3.8.4 -> 3.8.5	2018-11-05 21:57:11 +01:00
build-support	Merge pull request #49725 from pbogdan/chrootenv-strip	2018-11-05 18:57:28 +00:00
common-updater
data	ibm-plex: 1.1.6 -> 1.2.1	2018-11-03 20:39:10 -05:00
desktops	Merge pull request #48047 from thefloweringash/fix-mutter-crash	2018-11-04 13:47:16 +01:00
development	SDL2: 2.0.8 -> 2.0.9	2018-11-05 22:25:55 +01:00
games	dwarf-fortress: fix most of customization options	2018-11-06 01:00:17 +01:00
misc	retroarch: use python3 instead of python34	2018-11-04 18:48:24 +01:00
os-specific	Update sandbox-shell.nix	2018-11-05 15:16:45 -06:00
servers	Merge pull request #49715 from melazyk/master	2018-11-04 19:48:50 +02:00
shells	zsh-git-prompt: don't hard-code any particular compiler version	2018-11-02 20:16:56 +01:00
stdenv	Revert "Merge pull request #49398 from Synthetica9/implement-rfc0035" to fix eval	2018-11-04 11:02:43 +01:00
test	Remove openftd	2018-10-21 21:52:20 +02:00
tools	Merge branch 'master' into ckb-update-and-cleanup	2018-11-06 00:47:14 +00:00
top-level	Merge branch 'master' into ckb-update-and-cleanup	2018-11-06 00:47:14 +00:00