Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
beep
cups	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
drivers
emulators	ppsspp: update to 0.9.9.1	2014-08-25 10:14:44 +02:00
foldingathome
freestyle
ghostscript	Fix many package descriptions	2014-08-24 22:31:37 +02:00
gxemul
jackaudio	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
lilypond
maven
my-env
screensavers	Make platforms.allBut accept a list rather than a single platform	2014-08-09 12:31:33 +02:00
seafile-shared
solfege
source-and-tags
themes
uboot
vim-plugins	Vim-plugins: add vim-pathogen	2014-08-15 19:45:32 +02:00
xosd	Fix many package descriptions	2014-08-24 22:31:37 +02:00
misc.nix