Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging

2016-04-28 00:13:53 +03:00

..

applications

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

2016-04-28 00:13:53 +03:00

build-support

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

2016-04-28 00:13:53 +03:00

data

hack-font: 2.019 -> 2.020

2016-04-27 16:55:36 +02:00

desktops

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

2016-04-28 00:13:53 +03:00

development

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

2016-04-28 00:13:53 +03:00

games

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

2016-04-28 00:13:53 +03:00

misc

add get* helper functions and mass-replace manual outputs search with them

2016-04-25 13:24:39 +03:00

os-specific

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

2016-04-28 00:13:53 +03:00

servers

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

2016-04-28 00:13:53 +03:00

shells

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

2016-04-28 00:13:53 +03:00

stdenv

Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging

2016-04-25 18:02:47 +03:00

test

Remove cruft

2016-04-26 17:31:54 +02:00

tools

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

2016-04-28 00:13:53 +03:00

top-level

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

2016-04-28 00:13:53 +03:00