Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
atari++
atari800
bsod	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
darcnes
dlx	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
dosbox
fakenes	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
fceux
gens-gs
hatari	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
mednafen	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
mess
mupen64plus	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
ppsspp
retroarch
snes9x-gtk	snes9x-gtk: added changes requested by offlinehacker	2014-07-27 21:37:52 +02:00
uae	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
vice	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
VisualBoyAdvance	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
wine	wine: Update to 1.7.23	2014-08-04 01:09:01 +02:00
wxmupen64plus	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
zsnes	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00