Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD		2016-10-22 17:23:24 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
data	Merge pull request #19712 from peterhoeg/fontawesome-cleanup	2016-10-20 09:46:50 -04:00
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
games	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
misc	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
servers	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
shells
stdenv	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
test
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-22 17:23:24 +02:00