Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

..

applications

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

build-support

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

data

emojione: 1.2 -> 1.3

2016-08-14 22:37:07 +03:00

desktops

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

development

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

games

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

misc

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

os-specific

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

servers

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

shells

Merge branch 'master' into hardened-stdenv

2016-08-13 16:59:55 +02:00

stdenv

Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"

2016-08-15 19:05:52 -04:00

test

…

tools

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00

top-level

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00