[Scummvm-git-logs] scummvm master -> 4d6457205a3c86856cac44889c7b5ee5a29e111b

[lotharsm]

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:
69167061a9 WIN32: Fix typo in resource script
4d6457205a Merge pull request #1233 from ccawley2011/win32-rc


Commit: 69167061a9cce44840e6fbf57b46098f7e6dd491
    https://github.com/scummvm/scummvm/commit/69167061a9cce44840e6fbf57b46098f7e6dd491
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-06-29T16:19:32+01:00

Commit Message:
WIN32: Fix typo in resource script

Changed paths:
    dists/scummvm.rc
    dists/scummvm.rc.in


diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index fa650dc..e7e0a92 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -53,7 +53,7 @@ queen.tbl              FILE    "dists/engine-data/queen.tbl"
 #if ENABLE_SKY        == STATIC_PLUGIN
 sky.cpt                FILE    "dists/engine-data/sky.cpt"
 #endif
-#if RNABLE_SUPERNOVA  == STATIC_PLUGIN
+#if ENABLE_SUPERNOVA  == STATIC_PLUGIN
 supernova.dat          FILE    "dists/engine-data/supernova.dat"
 #endif
 #if ENABLE_TEENAGENT  == STATIC_PLUGIN
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 21cd8a4..3d5c21f 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -53,7 +53,7 @@ queen.tbl              FILE    "dists/engine-data/queen.tbl"
 #if ENABLE_SKY        == STATIC_PLUGIN
 sky.cpt                FILE    "dists/engine-data/sky.cpt"
 #endif
-#if RNABLE_SUPERNOVA  == STATIC_PLUGIN
+#if ENABLE_SUPERNOVA  == STATIC_PLUGIN
 supernova.dat          FILE    "dists/engine-data/supernova.dat"
 #endif
 #if ENABLE_TEENAGENT  == STATIC_PLUGIN


Commit: 4d6457205a3c86856cac44889c7b5ee5a29e111b
    https://github.com/scummvm/scummvm/commit/4d6457205a3c86856cac44889c7b5ee5a29e111b
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2018-06-29T17:21:23+02:00

Commit Message:
Merge pull request #1233 from ccawley2011/win32-rc

WIN32: Fix typo in resource script

Changed paths:
    dists/scummvm.rc
    dists/scummvm.rc.in