William A. Kennington III 954801a9a8 Merge branch 'master.upstream' into staging.upstream		2015-06-12 13:47:46 -07:00
..
admin	nxproxy & libxcomp: use lite instead of full nx-libs	2015-06-02 01:46:05 +02:00
archivers
audio	Merge pull request #8178 from jagajaga/fix/versions	2015-06-06 00:22:10 +03:00
backup
bluetooth
bootloaders/refind
cd-dvd
compression	Fixed some licenses	2015-06-10 13:00:42 +02:00
filesystems	boxfs: work around box.com breaking their API	2015-06-08 16:56:55 +02:00
graphics	Fixed some licenses	2015-06-10 13:00:42 +02:00
inputmethods
misc	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
networking	Merge pull request #8255 from adevress/master	2015-06-12 00:52:37 +02:00
package-management	dysnomia: fix compatibility with mariadb derivation	2015-06-12 16:19:26 +00:00
security	Update tor to 0.2.6.9	2015-06-12 12:49:41 +02:00
system	thermald: update and adopt	2015-06-12 03:42:29 +03:00
text	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
typesetting	pdf2djvu: update from 0.7.17 to 0.7.21, adopt it	2015-06-08 16:19:42 +02:00
video	rtmpdump_gnutls: add missing lib nettle & use git date format	2015-06-01 13:19:08 +02:00
virtualization
X11	Merge remote-tracking branch 'origin/gcc-4.9' into staging	2015-06-11 00:23:03 +02:00