Vladimír Čunát 35a927149f Merge branch 'master' into x-updates ... Conflicts (both messed with mesa): pkgs/top-level/all-packages.nix		2013-02-02 21:11:00 +01:00
..
cups	cups: Don't build on Darwin	2013-01-29 12:43:53 +01:00
drivers
emulators	wine: update to 1.5.23, update gecko	2013-02-02 15:03:02 +01:00
foldingathome
freestyle
ghostscript	ghostscript: fix infinite recursion in meta (sorry for that)	2013-01-31 13:21:21 +01:00
gxemul
jackaudio
lilypond
maven
my-env
screensavers
source-and-tags
themes/gtk2/oxygen-gtk
uboot	uboot: updating the default uboot to 2012.07	2013-01-27 15:38:39 +01:00
xosd
misc.nix