aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJohannes Schickel2012-05-31 04:28:09 -0700
committerJohannes Schickel2012-05-31 04:28:09 -0700
commit72ec77a631ea1a79d7e151d2e33c0cfdac23e7c7 (patch)
treeb55e02a3797e92f1c5dd1b84e6a2704cad04bd33 /common
parentdfa5405db8c33f91936d022954175799ea54658d (diff)
parent5de3f9c765ff50ffb386bf62213c882bd5c93cf1 (diff)
downloadscummvm-rg350-72ec77a631ea1a79d7e151d2e33c0cfdac23e7c7.tar.gz
scummvm-rg350-72ec77a631ea1a79d7e151d2e33c0cfdac23e7c7.tar.bz2
scummvm-rg350-72ec77a631ea1a79d7e151d2e33c0cfdac23e7c7.zip
Merge pull request #241 from fingolfin/osx-spelling
ALL: Correct spelling of "Mac OS X" in various places
Diffstat (limited to 'common')
-rw-r--r--common/taskbar.h2
-rw-r--r--common/updates.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/taskbar.h b/common/taskbar.h
index ba99d4e487..6f28028e74 100644
--- a/common/taskbar.h
+++ b/common/taskbar.h
@@ -34,7 +34,7 @@ namespace Common {
* The TaskbarManager allows interaction with the ScummVM application icon:
* - in the taskbar on Windows 7 and later
* - in the launcher for Unity
- * - in the dock on MacOSX
+ * - in the dock on Mac OS X
* - ...
*
* This allows GUI code and engines to display a progress bar, an overlay icon and/or count
diff --git a/common/updates.h b/common/updates.h
index 1e0babdf6d..4d58a216fb 100644
--- a/common/updates.h
+++ b/common/updates.h
@@ -30,7 +30,7 @@ namespace Common {
/**
* The UpdateManager allows configuring of the automatic update checking
* for systems that support it:
- * - using Sparkle on MacOSX
+ * - using Sparkle on Mac OS X
* - using WinSparkle on Windows
*
* Most of the update checking is completely automated and this class only