Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
atari++
atari800
bsod
darcnes
dlx
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 branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
wxmupen64plus
zsnes