Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00:00
..
cups	cups: fix reference to dbus.libs	2013-04-11 16:02:24 +02:00
drivers	hplip: make pyqt4 dependency conditional on qtSupport	2013-02-08 00:27:07 +01:00
emulators	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
foldingathome
freestyle
ghostscript	ghostscript: fix infinite recursion in meta (sorry for that)	2013-01-31 13:21:21 +01:00
gxemul
jackaudio	jackaudio/default.nix: Update to 1.9.9.5.	2013-02-03 20:22:43 +04:00
lilypond
maven
my-env	Merge branch 'master' into stdenv-updates.	2013-02-25 01:26:26 +01:00
screensavers	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
source-and-tags	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
themes	gnome-themes-standard: Initial expression	2013-03-25 15:23:45 +01:00
uboot	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
xosd
misc.nix