Vladimír Čunát 2858c41823 Merge branch 'master' into staging ... There were some conflicts in python modules, commented at #28314.		2017-08-29 10:51:54 +02:00
..
applications	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00
build-support	Merge pull request #28556 from obsidiansystems/cc-wrapper-nix-cleanup	2017-08-26 17:48:34 -04:00
common-updater
data	wireless-regdb: 2016-06-16 -> 2017.03.07	2017-08-28 00:54:43 +02:00
desktops	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00
development	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00
games	snake4: don't install with setuid	2017-08-29 00:34:33 +02:00
misc	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00
os-specific	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00
servers	darkhttpd: minor cleanups	2017-08-28 21:19:46 +08:00
shells	Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD	2017-08-21 04:44:40 +02:00
stdenv	expand-response-params: Build more normally	2017-08-25 15:10:02 -04:00
test	macos-sierra-shared: Make live code and add to nascent Darwin channel	2017-07-31 21:28:18 -04:00
tools	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00
top-level	Merge branch 'master' into staging	2017-08-29 10:51:54 +02:00