William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream ... This is a partial commit from staging in an attempt to make merges smaller.		2015-09-23 14:35:36 -07:00
..
applications	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
build-support	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
data	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
desktops	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
development	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
games	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
misc	lilypond: fix with new dblatex+texlive, fix meta	2015-09-23 21:14:16 +02:00
os-specific	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
servers	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	separateDebugInfo: Assert Linux	2015-09-22 20:21:10 +02:00
test
tools	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
top-level	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00