Vladimír Čunát 3ec2cea214 Merge master into x-updates ...

Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix

2014-06-20 00:24:38 +02:00

..

default.nix

Merge master into x-updates

2014-06-20 00:24:38 +02:00

wrapper.nix

pass jackaudio to alsaPlugins also adding convinient wrapper script

2009-09-21 15:55:26 +00:00