Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates ... Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.		2012-12-28 23:28:16 +01:00
..
cups
drivers
emulators	Wine: update to 1.5.20	2012-12-22 14:54:22 +04:00
foldingathome
freestyle
ghostscript
gxemul
jackaudio
lilypond
maven
my-env	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
screensavers
source-and-tags	Remove unnecessary parentheses around if conditions	2012-12-28 19:54:15 +01:00
themes/gtk2/oxygen-gtk
uboot	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
xosd
misc.nix