Peter Simons e6167ceaa2 Merge pull request #71237 from multun/sane_net.conf_conflict ... sane-backends: remove $out/etc/sane.d/net.conf		2019-10-17 17:03:53 +02:00
..
applications	Merge pull request #71237 from multun/sane_net.conf_conflict	2019-10-17 17:03:53 +02:00
build-support	Merge branch 'master' into staging-next	2019-10-03 01:47:08 +02:00
common-updater
data	papirus-icon-theme: 20190919 -> 20191009	2019-10-15 07:41:41 -03:00
desktops	Merge pull request #71147 from worldofpeace/gnome-3.34.1-more	2019-10-16 19:44:22 +00:00
development	Merge pull request #71245 from basile-henry/rustup-1.20.2	2019-10-17 10:54:39 +01:00
games	Merge pull request #71054 from MicrosoftTakeover/patch-1	2019-10-15 23:41:32 +02:00
misc	Merge pull request #71041 from nyanloutre/fs_uae_3_0_0	2019-10-16 21:58:02 +02:00
os-specific	Merge pull request #66841 from Izorkin/kernel-nftables	2019-10-16 13:39:55 +01:00
servers	zookeeper: Fix wrong paths in startup script	2019-10-17 02:59:10 -07:00
shells	Merge pull request #67670 from kampka/zsh-history	2019-10-16 01:57:23 +00:00
stdenv	Merge pull request #69028 from matthewbauer/remove-iselfexec-iselfdyn	2019-09-20 23:26:48 -04:00
test	tests.cc-wrapper-{clang,libcxx}-{8,9}: add stdenv tests for LLVM 8, 9	2019-09-19 15:03:09 -05:00
tools	Merge pull request #71160 from jerith666/nox-setuptools	2019-10-17 11:58:11 +02:00
top-level	ocamlPackages.spelll: init at 0.3	2019-10-17 05:50:26 +00:00