Merge 'master' into staging and re-revert merge

... from staging to master, reverted temporarily in aa9a04883e.
This commit is contained in:
Vladimír Čunát
2016-06-23 12:09:03 +02:00
526 changed files with 5888 additions and 4415 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator";
description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator";
longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan.";
license = stdenv.lib.licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.qknight ];