nixpkgs/pkgs/misc/emulators
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +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 retroarch: update to 0.9.9.7 2013-12-26 18:55:17 +01:00
uae
vice
VisualBoyAdvance Mark more packages as broken 2013-11-04 21:11:00 +01:00
wine Update Wine 2014-01-04 14:55:42 +04:00
wxmupen64plus
zsnes Merge master into stdenv-updates 2014-01-04 18:34:53 +01:00