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

Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix

2017-03-14 00:49:22 +02:00

..

applications

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

2017-03-14 00:49:22 +02:00

build-support

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

2017-03-14 00:49:22 +02:00

common-updater

…

data

hasklig: 0.9 -> 1.1

2017-03-05 15:32:30 +01:00

desktops

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

2017-03-14 00:49:22 +02:00

development

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

2017-03-14 00:49:22 +02:00

games

sgt-puzzles: 20161228.7cae89f -> 20170228.1f613ba

2017-03-09 18:47:37 +01:00

misc

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

2017-03-14 00:49:22 +02:00

os-specific

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

2017-03-14 00:49:22 +02:00

servers

exim: 4.88 -> 4.89 (#23670)

2017-03-12 23:40:22 +01:00

shells

bash: Set bash_cv_getcwd_malloc=yes when cross compiling

2017-03-14 00:33:29 +02:00

stdenv

Revert "stdenv: aarch64 is also ARM"

2017-03-11 15:57:51 +02:00

test

…

tools

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

2017-03-14 00:49:22 +02:00

top-level

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

2017-03-14 00:49:22 +02:00