Robin Gloster c1359ce04b Merge remote-tracking branch 'upstream/master' into gcc-6		2017-06-02 15:39:25 +02:00
..
applications	Merge remote-tracking branch 'upstream/master' into gcc-6	2017-06-02 15:39:25 +02:00
build-support	symlinkJoin: eliminate lndir spam	2017-05-27 16:19:34 -04:00
common-updater
data	geolite-legacy: 2016-07-08 -> 2017-05-26	2017-05-26 13:09:45 +02:00
desktops	Merge remote-tracking branch 'upstream/master' into gcc-6	2017-06-02 15:39:25 +02:00
development	Merge remote-tracking branch 'upstream/master' into gcc-6	2017-06-02 15:39:25 +02:00
games	Merge remote-tracking branch 'upstream/master' into gcc-6	2017-06-02 15:39:25 +02:00
misc	user-local config.nix path fixed in docs	2017-05-27 13:38:15 +03:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2017-06-01 10:17:38 +02:00
servers	elasticsearch: add 5.x package, service	2017-05-31 02:06:29 +02:00
shells	zsh-syntax-highlighting: 0.4.1 -> 0.5.0	2017-05-23 12:18:05 +02:00
stdenv	Merge branch 'staging' (early part)	2017-05-30 16:08:21 +02:00
test
tools	strongswan: 5.5.2 -> 5.5.3	2017-06-02 13:53:45 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into gcc-6	2017-06-02 15:39:25 +02:00