Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
atari++
atari800	atari800: update from 2.0.2 to 2.2.1	2013-12-18 18:18:17 +02:00
bsod
darcnes
dlx
dosbox
fakenes
gens-gs
hatari	More description fixes	2013-10-06 12:01:38 +02:00
mess
mupen64plus
retroarch
uae
vice
VisualBoyAdvance	Mark more packages as broken	2013-11-04 21:11:00 +01:00
wine	Merge master into x-updates	2013-12-18 23:21:29 +01:00
wxmupen64plus
zsnes