William A. Kennington III 98172435f7 Merge branch 'master.upstream' into staging.upstream		2015-10-01 10:43:44 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-10-01 10:43:44 -07:00
build-support	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
data	geolite-legacy: update 2015-09-22 -> 2015-09-29	2015-09-29 13:48:31 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-09-29 15:54:33 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-10-01 10:43:44 -07:00
games	Merge pull request #10081 from fazo96/openmw	2015-09-28 00:27:53 +03:00
misc	kde414: build with kdelibs-4.14.12	2015-09-27 15:08:12 -05:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-10-01 10:43:44 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-10-01 10:43:44 -07:00
shells
stdenv	Revert "pop"	2015-09-28 09:41:02 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-10-01 10:43:44 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-10-01 10:43:44 -07:00