joachifm ff52ac75f6 Merge pull request #14191 from mbakke/p7zip-15.14.1 ... p7zip: 9.38 -> 15.14.1		2016-04-09 18:11:28 +02:00
..
applications	Merge pull request #14554 from sheenobu/bugfix/spotify/upgrade_ssl	2016-04-09 18:05:05 +02:00
build-support	Merge commit 'bde820' from staging	2016-04-06 01:18:28 +03:00
data	tzdata: 2016b -> 2016c	2016-03-31 02:53:31 +02:00
desktops	lxmenu-data: init at 0.1.5	2016-04-08 15:42:37 +02:00
development	Merge pull request #14518 from CrystalGamma/master	2016-04-09 17:47:15 +02:00
games	Merge pull request #14126 from mpscholten/factorio	2016-04-08 02:23:24 +02:00
misc	hplip: canonicalise 56-hpmud.rules' paths if installed	2016-04-04 22:14:21 +02:00
os-specific	Revert "kernelHeaders: fix build with libmpc"	2016-04-07 11:35:22 +01:00
servers	Merge pull request #14555 from thall/ums_6_2_2	2016-04-09 17:09:10 +01:00
shells	oh-my-zsh: 2016-03-31 -> 2016-04-06	2016-04-07 08:33:17 -04:00
stdenv	Merge commit 'bde820' from staging	2016-04-06 01:18:28 +03:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	p7zip: 9.38 -> 15.14.1	2016-04-09 14:05:23 +01:00
top-level	Merge pull request #14551 from pmahoney/awscli	2016-04-09 18:08:38 +02:00