Pascal Wittmann a7f91d751b Merge branch 'master' of github.com:NixOS/nixpkgs		2015-12-13 11:22:27 +01:00
..
applications	Merge pull request #11656 from enolan/master	2015-12-13 11:13:31 +01:00
build-support	makeDesktopItem: add StartupNotify key	2015-12-12 17:25:56 -06: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 pull request #11663 from datakurre/datakurre-buildout	2015-12-13 11:15:44 +01:00
games	castle_combat: remove game	2015-12-11 10:41:37 +01:00
misc	vimPlugins: update to 11.12.2015	2015-12-11 21:31:40 +03:00
os-specific	systemd: Apply VirtualBox fix for detect-virt.	2015-12-13 05:36:10 +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	gnuplot: use texlive-new	2015-12-12 10:47:03 -06:00
top-level	Merge branch 'master' of github.com:NixOS/nixpkgs	2015-12-13 11:22:27 +01:00