[Scummvm-cvs-logs] scummvm master -> 98f0be39e27a69bae5fedab5f82e876ea5fc0e41

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0dd3563085 COMMON: Add Apple II platform
98f0be39e2 Merge pull request #743 from fuzzie/apple2-platform


Commit: 0dd3563085123e97e8424ee951dbecf65c022769
    https://github.com/scummvm/scummvm/commit/0dd3563085123e97e8424ee951dbecf65c022769
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2016-04-02T21:57:48+02:00

Commit Message:
COMMON: Add Apple II platform

Changed paths:
    common/platform.cpp
    common/platform.h



diff --git a/common/platform.cpp b/common/platform.cpp
index 636c1dd..280185d 100644
--- a/common/platform.cpp
+++ b/common/platform.cpp
@@ -27,6 +27,7 @@ namespace Common {
 
 const PlatformDescription g_platforms[] = {
 	{ "2gs", "2gs", "2gs", "Apple IIgs", kPlatformApple2GS },
+	{ "apple2", "apple2", "apple2", "Apple II", kPlatformApple2 },
 	{ "3do", "3do", "3do", "3DO", kPlatform3DO },
 	{ "acorn", "acorn", "acorn", "Acorn", kPlatformAcorn },
 	{ "amiga", "ami", "amiga", "Amiga", kPlatformAmiga },
diff --git a/common/platform.h b/common/platform.h
index 17a332b..15bcddb 100644
--- a/common/platform.h
+++ b/common/platform.h
@@ -50,6 +50,7 @@ enum Platform {
 	kPlatformSegaCD,
 	kPlatform3DO,
 	kPlatformPCEngine,
+	kPlatformApple2,
 	kPlatformApple2GS,
 	kPlatformPC98,
 	kPlatformWii,


Commit: 98f0be39e27a69bae5fedab5f82e876ea5fc0e41
    https://github.com/scummvm/scummvm/commit/98f0be39e27a69bae5fedab5f82e876ea5fc0e41
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-02T23:08:39+02:00

Commit Message:
Merge pull request #743 from fuzzie/apple2-platform

COMMON: Add Apple II platform

Changed paths:
    common/platform.cpp
    common/platform.h