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

2015-08-04 15:32:43 -07:00

..

applications

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

build-support

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

data

geolite-legacy: 2015-07-30 -> 2015-08-03

2015-08-03 14:33:55 +02:00

desktops

Merge branch 'master.upstream' into staging.upstream

2015-08-03 14:27:14 -07:00

development

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

games

minecraft-server: 1.8.1 -> 1.8.8

2015-07-31 21:20:19 +03:00

misc

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

os-specific

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

servers

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

shells

More docs/manpages in separate outputs

2015-07-27 00:27:54 +02:00

stdenv

Force Nixpkgs rebuild

2015-08-03 20:03:11 +02:00

test

…

tools

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00

top-level

Merge branch 'master.upstream' into staging.upstream

2015-08-04 15:32:43 -07:00