Frederik Rietdijk 77b7fca588 Merge remote-tracking branch 'upstream/master' into HEAD		2017-05-27 14:28:05 +02:00
..
applications	msieve: update and enable on Darwin	2017-05-26 18:18:39 -04:00
build-support	Merge pull request #26131 from matejc/pkgs/build-support/docker/pull	2017-05-27 12:44:34 +02: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-05-27 14:28:05 +02:00
games	xonotic: 0.8.1 -> 0.8.2	2017-05-26 18:24:34 +02:00
misc	user-local config.nix path fixed in docs	2017-05-27 13:38:15 +03:00
os-specific	cifs-utils: 6.5 -> 6.6	2017-05-26 20:56:48 +02:00
servers	Merge older staging	2017-05-26 15:45:43 +02:00
shells	zsh-syntax-highlighting: 0.4.1 -> 0.5.0	2017-05-23 12:18:05 +02:00
stdenv	Merge branch 'master' into staging	2017-05-24 03:24:06 +02:00
test
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2017-05-27 14:28:05 +02:00
top-level	Merge remote-tracking branch 'upstream/master' into HEAD	2017-05-27 14:28:05 +02:00