Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix

2018-03-13 23:04:18 +02:00

..

applications

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

2018-03-13 23:04:18 +02:00

build-support

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

2018-03-13 23:04:18 +02:00

common-updater

…

data

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

2018-03-13 23:04:18 +02:00

desktops

Merge pull request #36888 from volth/xfce-naming

2018-03-13 18:44:59 +00:00

development

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

2018-03-13 23:04:18 +02:00

games

Merge pull request #36659 from Ma27/fix-freeorion

2018-03-13 17:55:08 +00:00

misc

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

2018-03-13 23:04:18 +02:00

os-specific

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

2018-03-13 23:04:18 +02:00

servers

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

2018-03-13 23:04:18 +02:00

shells

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

2018-03-13 23:04:18 +02:00

stdenv

Merge branch 'master' into staging

2018-03-10 20:38:13 +00:00

test

…

tools

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

2018-03-13 23:04:18 +02:00

top-level

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

2018-03-13 23:04:18 +02:00