Vladimír Čunát 6295a3ca36 Merge recent master into x-updates ... Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-08-02 05:08:07 +02:00
..
applications	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
build-support
data	source-han-sans: fixed package name	2014-07-30 16:27:20 +02:00
desktops	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
development	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
games	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
misc	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
os-specific	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
servers	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
shells	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
stdenv
test
tools	Merge branch 'i3-tests'.	2014-08-01 05:51:57 +02:00
top-level	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00