Jörg Thalheim 2ba1173715 Merge pull request #31694 from Mic92/openafs ... linuxPackages.openafs-client: fixes for 4.14		2017-11-25 16:04:26 +00:00
..
applications	Merge pull request #31956 from xaverdh/master	2017-11-25 16:01:56 +00:00
build-support	Merge branch 'staging' (older one)	2017-11-24 18:36:54 +01:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
development	tracefilegen: 2015-11-14 -> 2017-05-13	2017-11-25 14:07:07 +01:00
games	Merge pull request #31994 from kierdavis/freesweep	2017-11-25 14:51:29 +00:00
misc	Merge pull request #31184 from AndersonTorres/upload/openmsx	2017-11-25 15:55:27 +00:00
os-specific	conky: fix compilation with gcc-7	2017-11-25 15:57:40 +01:00
servers	Merge pull request #31694 from Mic92/openafs	2017-11-25 16:04:26 +00:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	lr: 1.1 → 1.2	2017-11-25 16:53:47 +01:00
top-level	Merge pull request #31956 from xaverdh/master	2017-11-25 16:01:56 +00:00