Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04: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
hatari	hatari: fix pthread_cancel+gcc_s thing, and some spacing	2013-04-23 11:05:46 +04:00
mess
mupen64plus	Adding back the 1.5 expression of mupen64plus	2013-03-28 18:16:40 +01:00
uae
vice
VisualBoyAdvance
wine	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
wxmupen64plus	Updating mupen64plus, and adding a GUI for it.	2013-03-28 18:13:18 +01:00
zsnes