William A. Kennington III afe1f0f127 Merge branch 'master.upstream' into staging.upstream		2015-08-29 17:48:49 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-08-29 17:48:49 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-08-28 17:55:20 -07:00
data	Unify the docbook-xsl and docbook-xsl-ns expressions	2015-08-27 19:07:44 +02:00
desktops	gcr: 3.14.0 -> 3.16.0, should fix race condition during build	2015-08-28 11:35:29 +02:00
development	Merge branch 'master.upstream' into staging.upstream	2015-08-29 17:48:49 -07:00
games	glob2: fix build failure	2015-08-29 01:09:24 -04:00
misc	vimPlugins: adding css_color_5056, ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons	2015-08-29 21:01:38 +02:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-08-28 17:55:20 -07:00
servers	Merge pull request #9531 from offlinehacker/pkgs/skydns/update_2.5.2b	2015-08-29 18:34:04 +02:00
shells	add binutils to bash build for size	2015-08-12 11:27:54 -07:00
stdenv	Merge branch 'master.upstream' into staging.upstream	2015-08-28 17:55:20 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-08-29 17:48:49 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-08-29 17:48:49 -07:00