Frederik Rietdijk 3b5fd4dada Merge pull request #41085 from zimbatm/supervisor-3.3.4 ... python2Packages.supervisor: 3.1.4 -> 3.3.4		2018-05-27 20:08:07 +02:00
..
applications	Merge staging into master	2018-05-27 17:44:08 +02:00
build-support	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into staging	2018-05-26 19:01:18 +03:00
desktops	Merge branch 'master' into staging	2018-05-20 13:20:53 +02:00
development	Merge pull request #41085 from zimbatm/supervisor-3.3.4	2018-05-27 20:08:07 +02:00
games	Merge pull request #41009 from matthewbauer/normalize-names	2018-05-25 16:32:48 -05:00
misc	Merge pull request #41009 from matthewbauer/normalize-names	2018-05-25 16:32:48 -05:00
os-specific	Merge staging into master	2018-05-27 17:44:08 +02:00
servers	Revert "bind: 9.12.1-P2 -> 9.13.0"	2018-05-27 11:04:33 +02:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2018-05-23 09:40:37 -04:00
stdenv	Merge pull request #40933 from obsidiansystems/linux-to-darwin	2018-05-23 11:37:43 -04:00
test	tests.cc-wrapper: verify building with sanitizers	2018-05-25 11:53:18 -04:00
tools	Merge staging into master	2018-05-27 17:44:08 +02:00
top-level	Merge pull request #41085 from zimbatm/supervisor-3.3.4	2018-05-27 20:08:07 +02:00