Tuomas Tynkkynen 67c73b4e64 Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

..

applications

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

build-support

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

common-updater

…

data

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

desktops

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

development

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

games

bzflag: 2.4.10 -> 2.4.12

2018-01-17 01:46:41 +01:00

misc

elk: 5.6.5 -> 5.6.6

2018-01-17 02:11:19 +01:00

os-specific

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

servers

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

shells

Remove nckx as a maintainer for all packages

2018-01-16 23:00:49 +01:00

stdenv

Merge branch 'ericson2314-cross-master' into staging

2018-01-16 13:05:39 -05:00

test

…

tools

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00

top-level

Merge commit '2e56ba' from staging into master

2018-01-17 12:50:46 +02:00