Jascha Geerds 7b82e5b2e8 Merge pull request #11700 from magnetophon/khal-master ... khal: update 0.6.0->0.7.0		2015-12-14 12:30:37 +01:00
..
applications	Merge pull request #11700 from magnetophon/khal-master	2015-12-14 12:30:37 +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 pull request #11215 from ArdaXi/efl-without-vlc	2015-12-13 22:56:14 +01:00
development	{lib-}mediainfo{-gui}: 0.7.79 -> 0.7.80	2015-12-13 17:16:07 +00:00
games	zandronum: unify packages, fix building, cleanup	2015-12-13 15:14:11 +03:00
misc	Merge pull request #11416 from magnetophon/jack-master	2015-12-13 18:40:59 +01:00
os-specific	Merge pull request #11549 from jgillich/syslinux	2015-12-14 13:21:31 +03:00
servers	sabnzbd: Fix OpenSSL wrapping.	2015-12-13 14:56:25 +00:00
shells	fish: Use /bin/hostname on darwin. Fixes #11012.	2015-12-13 22:52:35 +03:00
stdenv	allow{reason}: a bit more explicit error message	2015-12-09 17:01:46 +01:00
test
tools	Merge branch 'feature/simp_le-service' of https://github.com/mayflower/nixpkgs into mayflower-feature/simp_le-service	2015-12-13 17:01:42 +03:00
top-level	Merge pull request #11699 from luispedro/add_mahotas	2015-12-14 11:29:43 +01:00