William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

..

applications

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

build-support

Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00

data

Merge branch 'master.upstream' into staging.upstream

2015-06-30 23:58:07 -07:00

desktops

Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00

development

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

games

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

misc

xscreensaver: Fix SHA256 hash of upstream tarball.

2015-07-05 16:42:07 +02:00

os-specific

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

servers

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

shells

Merge branch 'master' into staging

2015-06-25 09:15:05 -05:00

stdenv

add gnused to impure darwin stdenv

2015-06-19 22:08:01 -07:00

test

…

tools

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00

top-level

Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00