Tuomas Tynkkynen 41458f74a4 Merge remote-tracking branch 'upstream/master' into staging		2017-09-13 22:59:04 +03:00
..
applications	bean-add: 2017-04-16 -> 2017-09-13	2017-09-13 21:53:56 +02:00
build-support	Merge pull request #28963 from nlewo/docker-readiness	2017-09-13 10:39:16 +01:00
common-updater
data	Merge pull request #28964 from chrisburr/patch-2	2017-09-12 09:42:33 +01:00
desktops	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
development	Merge remote-tracking branch 'upstream/master' into staging	2017-09-13 22:59:04 +03:00
games	scorched3d: fixing build with gcc6	2017-09-08 15:08:00 +02:00
misc	arc-theme: docs were going to the wrong directory	2017-09-13 10:41:57 +08:00
os-specific	_915resolution: Only works on x86	2017-09-13 15:42:50 +03:00
servers	Merge pull request #29035 from ryantm/update_mattermost	2017-09-13 19:41:10 +00:00
shells	grml-zsh-config: generalize support to unix systems	2017-09-01 11:38:38 +03:00
stdenv	stdenv bootstrap: fix evaluation	2017-09-10 11:16:47 +02:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	socklog: fixup implicit function declarations	2017-09-13 18:27:15 +02:00
top-level	Add atom-beta	2017-09-13 21:08:32 +02:00