Peter Simons 04b2efff19 Merge branch 'master' into stdenv-updates.		2013-02-25 01:26:26 +01:00
..
cups	cups: Don't build on Darwin	2013-01-29 12:43:53 +01:00
drivers	hplip: make pyqt4 dependency conditional on qtSupport	2013-02-08 00:27:07 +01:00
emulators	add winetricks, modified by vcunat@gmail.com	2013-02-10 16:20:24 +01:00
foldingathome
freestyle
ghostscript	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
gxemul
jackaudio	jackaudio/default.nix: Update to 1.9.9.5.	2013-02-03 20:22:43 +04:00
lilypond
maven	Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4	2012-08-25 19:43:54 +02:00
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/gtk2/oxygen-gtk	oxygen-gtk: upgrade gtk2 version to 1.3.2.1	2013-02-24 02:30:53 +01:00
uboot	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
xosd
misc.nix