Thomas Tuegel 3960ecb933 Merge branch 'plasma-5.5'		2015-12-11 07:21:50 -06:00
..
applications	Merge branch 'plasma-5.5'	2015-12-11 07:21:50 -06:00
build-support	Merge pull request #11602 from zimbatm/stricter-chroot-user	2015-12-11 00:40:41 +03:00
data	font-droid: fix srcs urls	2015-12-10 05:45:24 +01:00
desktops	Merge branch 'plasma-5.5'	2015-12-11 07:21:50 -06:00
development	Merge branch 'plasma-5.5'	2015-12-11 07:21:50 -06:00
games	castle_combat: remove game	2015-12-11 10:41:37 +01:00
misc	wine unstable: 1.8-rc2 -> 1.8-rc3	2015-12-07 22:22:56 +01:00
os-specific	linux-testing: Revert build fix for -rc3.	2015-12-11 11:31:05 +01:00
servers	cassandra 2.1.11 -> 2.1.12	2015-12-08 03:04:31 +01:00
shells	zsh: 5.1.1 -> 5.2	2015-12-05 17:07:41 +01:00
stdenv	allow{reason}: a bit more explicit error message	2015-12-09 17:01:46 +01:00
test
tools	python ansible2: move to python-packages.nix	2015-12-11 11:28:33 +01:00
top-level	Merge branch 'plasma-5.5'	2015-12-11 07:21:50 -06:00