Vladimír Čunát 00672dec8a Merge older staging ...

This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.

2017-05-26 15:45:43 +02:00

..

applications

Merge older staging

2017-05-26 15:45:43 +02:00

build-support

Merge older staging

2017-05-26 15:45:43 +02:00

common-updater

common-updater-script: fix error handling

2017-05-19 17:14:43 +03:00

data

geolite-legacy: 2016-07-08 -> 2017-05-26

2017-05-26 13:09:45 +02:00

desktops

webkitgtk: 2.14.11 -> 2.16.3

2017-05-26 16:20:54 +03:00

development

Merge older staging

2017-05-26 15:45:43 +02:00

games

Merge branch 'master' into staging

2017-05-24 03:24:06 +02:00

misc

cups_filters: 1.11.1 -> 1.14.0

2017-05-24 12:51:24 +02:00

os-specific

Merge older staging

2017-05-26 15:45:43 +02:00

servers

Merge older staging

2017-05-26 15:45:43 +02:00

shells

zsh-syntax-highlighting: 0.4.1 -> 0.5.0

2017-05-23 12:18:05 +02:00

stdenv

Merge branch 'master' into staging

2017-05-24 03:24:06 +02:00

test

…

tools

Merge older staging

2017-05-26 15:45:43 +02:00

top-level

Merge older staging

2017-05-26 15:45:43 +02:00