William A. Kennington III e5bf20a6c6 Merge branch 'master' into staging		2015-05-29 14:52:51 -07:00
..
applications	Merge branch 'master' into staging	2015-05-29 14:52:51 -07:00
build-support	Fix ca-bundle paths	2015-05-29 14:03:34 -07:00
data	cacert: Build directly from nss instead of our own tarball	2015-05-29 13:52:07 -07:00
desktops	Merge branch 'master' into staging	2015-05-29 14:52:51 -07:00
development	Merge branch 'master' into staging	2015-05-29 14:52:51 -07:00
games	pulseaudio: Remove default derivation	2015-05-29 14:47:33 -07:00
misc	pulseaudio: Remove default derivation	2015-05-29 14:47:33 -07:00
os-specific	grsecurity: Update stable and test patches	2015-05-29 19:49:46 +02:00
servers	Merge branch 'master' into staging	2015-05-29 14:52:51 -07:00
shells	cygwin: bash updated to 4.3 for cygwin platform	2015-05-29 10:18:06 +02:00
stdenv	cygwin: stdenv	2015-05-28 10:53:34 +02:00
test
tools	Use libpulseaudio instead of pulseaudio	2015-05-29 14:32:56 -07:00
top-level	Merge branch 'master' into staging	2015-05-29 14:52:51 -07:00