diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /dists/macosx | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'dists/macosx')
| -rw-r--r-- | dists/macosx/DS_Store | bin | 12292 -> 12292 bytes | |||
| -rw-r--r-- | dists/macosx/Info.plist | 4 | ||||
| -rw-r--r-- | dists/macosx/Info.plist.in | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | dists/macosx/scummvm_osx_appcast.xml | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dists/macosx/DS_Store b/dists/macosx/DS_Store Binary files differindex 2d4193a6af..7ad5a19d61 100644 --- a/dists/macosx/DS_Store +++ b/dists/macosx/DS_Store diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index a355ec1e62..94adc00a9b 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -28,7 +28,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>1.5.0git, Copyright 2001-2011 The ScummVM team</string> + <string>1.5.0git, Copyright 2001-2012 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -46,7 +46,7 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2011 The ScummVM team</string> + <string>Copyright 2001-2012 The ScummVM team</string> <key>SUFeedURL</key> <string>http://www.scummvm.org/appcasts/macosx/release.xml</string> <key>SUPublicDSAKeyFile</key> diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in index b251f32509..ff010bee07 100644 --- a/dists/macosx/Info.plist.in +++ b/dists/macosx/Info.plist.in @@ -28,7 +28,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>@VERSION@, Copyright 2001-2011 The ScummVM team</string> + <string>@VERSION@, Copyright 2001-2012 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -46,7 +46,7 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2011 The ScummVM team</string> + <string>Copyright 2001-2012 The ScummVM team</string> <key>SUFeedURL</key> <string>http://www.scummvm.org/appcasts/macosx/release.xml</string> <key>SUPublicDSAKeyFile</key> diff --git a/dists/macosx/scummvm_osx_appcast.xml b/dists/macosx/scummvm_osx_appcast.xml index 455b062b6b..455b062b6b 100755..100644 --- a/dists/macosx/scummvm_osx_appcast.xml +++ b/dists/macosx/scummvm_osx_appcast.xml |