Parnell Springmeyer 9e36a58649 Merging against upstream master		2017-02-13 17:16:28 -06:00
..
applications	Merging against upstream master	2017-02-13 17:16:28 -06:00
build-support	Merging against upstream master	2017-02-13 17:16:28 -06:00
data	Merge branch 'master' into staging	2017-02-09 08:42:04 +01:00
desktops	Merging against upstream master	2017-02-13 17:16:28 -06:00
development	Merging against upstream master	2017-02-13 17:16:28 -06:00
games	zdbsp: init at 1.19	2017-02-11 05:47:09 +01:00
misc	Merge pull request #22739 from Mic92/vam	2017-02-13 15:10:35 +01:00
os-specific	Merging against upstream master	2017-02-13 17:16:28 -06:00
servers	Merging against upstream master	2017-02-13 17:16:28 -06:00
shells	elvish: 0.1 -> 0.5	2017-02-12 21:37:53 +01:00
stdenv	Merge pull request #22387 from Ericson2314/cross-3-platforms	2017-02-05 17:41:31 -05:00
test
tools	Merging against upstream master	2017-02-13 17:16:28 -06:00
top-level	php: default to php71	2017-02-13 22:48:45 +01:00