zimbatm 7af9f90a32 Merge pull request #16375 from vandenoever/zanshin ... zanshin: 0.2.1 -> 0.3.1		2016-06-23 15:36:26 +01:00
..
applications	Merge pull request #16375 from vandenoever/zanshin	2016-06-23 15:36:26 +01:00
build-support	Revert "Merge branch 'staging'" due to glibc	2016-06-23 09:25:10 +02:00
data	font-awesome-ttf: 4.5.0 -> 4.6.3 (#16456)	2016-06-23 16:19:50 +02:00
desktops	kde5.kauth: remove unused kauth-policy-install.patch	2016-06-23 12:13:24 +02:00
development	pypi2nix: Use pypi mirror (#16451)	2016-06-23 12:35:29 +02:00
games	Revert "Merge branch 'staging'" due to glibc	2016-06-23 09:25:10 +02:00
misc	wine: set default features in all-packages	2016-06-23 14:01:09 +03:00
os-specific	Revert "Merge branch 'staging'" due to glibc	2016-06-23 09:25:10 +02:00
servers	Revert "Merge branch 'staging'" due to glibc	2016-06-23 09:25:10 +02:00
shells	tcsh: import an Arch patch (merging the two patches into a single one) for fixing gcc5 optimisation	2016-06-23 11:01:21 +02:00
stdenv	Revert "Merge branch 'staging'" due to glibc	2016-06-23 09:25:10 +02:00
test
tools	Merge pull request #16425 from mbakke/yubikey-neo-manager	2016-06-23 15:39:25 +02:00
top-level	Merge pull request #16425 from mbakke/yubikey-neo-manager	2016-06-23 15:39:25 +02:00