Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix		2013-04-04 21:43:40 +02:00
..
atari++
atari800
bsod
darcnes
dlx	dlx: link with gcc instead of g++ -- there is no c++ code here	2012-12-05 16:44:04 +01:00
dosbox
fakenes
gens-gs
mess
mupen64plus	Adding back the 1.5 expression of mupen64plus	2013-03-28 18:16:40 +01:00
uae
vice
VisualBoyAdvance
wine	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
wxmupen64plus	Updating mupen64plus, and adding a GUI for it.	2013-03-28 18:13:18 +01:00
zsnes