John Ericson 169227bfd2 Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix		2017-12-29 14:24:10 -05:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2017-08-21 18:42:57 -04:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2017-08-21 18:42:57 -04:00
common-updater
data	Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD	2017-08-21 04:44:40 +02:00
desktops	Merge remote-tracking branch 'upstream/master' into staging	2017-08-21 18:42:57 -04:00
development	Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix	2017-12-29 14:24:10 -05:00
games	Merge remote-tracking branch 'upstream/master' into HEAD	2017-08-17 18:34:17 +02:00
misc	Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD	2017-08-21 04:44:40 +02:00
os-specific	Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix	2017-12-29 14:24:10 -05:00
servers	nginx: enable stream support by default	2017-08-21 20:30:41 +02:00
shells	Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD	2017-08-21 04:44:40 +02:00
stdenv	Merge remote-tracking branch 'upstream/master' into staging	2017-08-21 18:42:57 -04:00
test
tools	Merge commit 'c9ca54199409324101bdee38f5b16e7656a16a22' into gcc-modernize-builder	2017-12-07 01:42:35 -05:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2017-08-21 18:42:57 -04:00