Frederik Rietdijk 8b5dc2d67b Merge remote-tracking branch 'upstream/master' into HEAD		2017-06-01 10:17:38 +02:00
..
applications	Merge pull request #26293 from Profpatsch/inkscape-extensions-python	2017-06-01 09:25:17 +02:00
build-support	symlinkJoin: eliminate lndir spam	2017-05-27 16:19:34 -04:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	geolite-legacy: 2016-07-08 -> 2017-05-26	2017-05-26 13:09:45 +02:00
desktops	webkitgtk: 2.14.11 -> 2.16.3	2017-05-26 16:20:54 +03:00
development	Merge remote-tracking branch 'upstream/master' into HEAD	2017-06-01 10:17:38 +02:00
games	Merge pull request #26182 from lheckemann/xonotic-audio	2017-05-30 19:53:37 +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	daemontools: fix build	2017-05-31 23:57:15 +01:00
top-level	Merge pull request #26289 from rnhmjoj/electrum	2017-06-01 00:22:56 +01:00