Bas van Dijk 7035598251 Merge pull request #51225 from LumiGuide/elk-6.5.1 ... elk: 6.3.2 -> 6.5.1		2018-12-02 14:44:47 +01:00
..
applications	Merge branch 'whipper'	2018-12-02 14:22:37 +01:00
build-support	Merge master into staging-next	2018-11-30 17:46:21 +01:00
common-updater	common-updater, firefox: fix updater for firefox	2018-11-16 23:04:54 +09:00
data	Merge pull request #50987 from c0bw3b/pkg/mailcap	2018-11-25 16:14:34 +01:00
desktops	Merge pull request #50977 from jtojnar/parallel-update.nix	2018-12-02 01:23:39 +01:00
development	Merge pull request #51225 from LumiGuide/elk-6.5.1	2018-12-02 14:44:47 +01:00
games	minecraft: Fix versions <1.13	2018-12-02 00:15:55 +01:00
misc	Merge pull request #51225 from LumiGuide/elk-6.5.1	2018-12-02 14:44:47 +01:00
os-specific	linuxPackages_4_18.nvidia_x11_legacy304: mark as broken on 4.18 and newer	2018-12-02 10:46:11 +00:00
servers	Merge pull request #51225 from LumiGuide/elk-6.5.1	2018-12-02 14:44:47 +01:00
shells	antibody: 4.0.0 -> 4.0.2	2018-12-02 02:48:29 -05:00
stdenv	make-derivation: remove selfConsistent check	2018-11-30 17:58:33 +01:00
test	Merge pull request #50212 from matthewbauer/host-emulator	2018-11-29 19:34:20 -06:00
tools	Merge pull request #51225 from LumiGuide/elk-6.5.1	2018-12-02 14:44:47 +01:00
top-level	Merge pull request #51225 from LumiGuide/elk-6.5.1	2018-12-02 14:44:47 +01:00