aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-11-21 15:26:31 -0600
committerColin Snover2017-11-21 15:26:52 -0600
commitc13defd661adfe0ba64afc902ee1c10fb23263ba (patch)
tree603b0d9e6bac8cae02f8945ab12f78a311259c5a
parent0c222d95d6a692afc1bb68db2e7eb1693929a2e5 (diff)
downloadscummvm-rg350-c13defd661adfe0ba64afc902ee1c10fb23263ba.tar.gz
scummvm-rg350-c13defd661adfe0ba64afc902ee1c10fb23263ba.tar.bz2
scummvm-rg350-c13defd661adfe0ba64afc902ee1c10fb23263ba.zip
RELEASE: 1.10 will henceforth be known as 2.0
General consensus on the ML was that people wanted to do this. http://lists.scummvm.org/pipermail/scummvm-devel/2017-November/012008.html
-rw-r--r--NEWS2
-rw-r--r--backends/platform/psp/README.PSP2
-rw-r--r--base/internal_version.h2
-rw-r--r--dists/android/AndroidManifest.xml2
-rw-r--r--dists/gph/README-GPH2
-rw-r--r--dists/gph/scummvm.ini2
-rw-r--r--dists/ios7/Info.plist4
-rw-r--r--dists/iphone/Info.plist4
-rw-r--r--dists/irix/scummvm.spec2
-rw-r--r--dists/macosx/Info.plist6
-rw-r--r--dists/macosx/dockplugin/Info.plist4
-rw-r--r--dists/openpandora/PXML.xml8
-rw-r--r--dists/openpandora/README-OPENPANDORA2
-rw-r--r--dists/openpandora/README-PND.txt2
-rw-r--r--dists/openpandora/index.html4
-rw-r--r--dists/redhat/scummvm-tools.spec2
-rw-r--r--dists/redhat/scummvm.spec2
-rw-r--r--dists/riscos/!Boot,feb2
-rw-r--r--dists/scummvm.rc8
-rwxr-xr-xdists/slackware/scummvm.SlackBuild2
-rw-r--r--dists/wii/meta.xml2
-rw-r--r--doc/de/NEUES2
22 files changed, 34 insertions, 34 deletions
diff --git a/NEWS b/NEWS
index 763e87f124..db92a8e42f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
For a more comprehensive changelog of the latest experimental code, see:
https://github.com/scummvm/scummvm/commits/
-1.10.0 (YYYY-MM-DD)
+2.0.0 (YYYY-MM-DD)
New Games:
- Added support for Full Pipe.
- Added support for Hi-Res Adventure #3: Cranston Manor.
diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index 46e027f4f7..b2f639af22 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 1.10.0git README
+ScummVM-PSP 2.0.0git README
==============================================================================
Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index c46922da57..63b63e5484 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,4 +16,4 @@
#define SCUMMVM_REVISION
#endif
-#define SCUMMVM_VERSION "1.10.0git" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "2.0.0git" SCUMMVM_REVISION
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 208ed62f90..d4c40a8b17 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.scummvm.scummvm"
android:versionCode="@ANDROID_VERSIONCODE@"
- android:versionName="1.10.0git"
+ android:versionName="2.0.0git"
android:sharedUserId="org.scummvm.scummvm">
<!-- This version works on Android 1.5 (SDK 3) and newer, but we
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index f1588b3e38..55136e5352 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 1.10.0git - GPH DEVICE SPECIFIC README
+ScummVM 2.0.0git - GPH DEVICE SPECIFIC README
------------------------------------------------------------------------
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index 392eccf29b..339554d9ee 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
[info]
-name="ScummVM 1.10.0git"
+name="ScummVM 2.0.0git"
path="/scummvm/scummvm.gpe"
icon="/scummvm/scummvm.png"
title="/scummvm/scummvmb.png"
diff --git a/dists/ios7/Info.plist b/dists/ios7/Info.plist
index 3684ade28d..6cc5f6ede9 100644
--- a/dists/ios7/Info.plist
+++ b/dists/ios7/Info.plist
@@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>UIApplicationExitsOnSuspend</key>
<false/>
<key>UIDeviceFamily</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index 491f3af3ac..a757eb645f 100644
--- a/dists/iphone/Info.plist
+++ b/dists/iphone/Info.plist
@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>CFBundleIconFile</key>
<string>icon.png</string>
<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 9b218ff988..3e121d8a82 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
product scummvm
- id "ScummVM 1.10.0git"
+ id "ScummVM 2.0.0git"
image sw
id "software"
version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index ab0bf4db27..ffeb9dd569 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm</string>
<key>CFBundleGetInfoString</key>
- <string>1.10.0git, Copyright 2001-2017 The ScummVM Team</string>
+ <string>2.0.0git, Copyright 2001-2017 The ScummVM Team</string>
<key>CFBundleIconFile</key>
<string>scummvm.icns</string>
<key>CFBundleIdentifier</key>
@@ -45,9 +45,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>CFBundleVersion</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2017 The ScummVM Team</string>
<key>NSPrincipalClass</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index dc2a4fda45..7f51ef4d4a 100644
--- a/dists/macosx/dockplugin/Info.plist
+++ b/dists/macosx/dockplugin/Info.plist
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>CFBundleVersion</key>
- <string>1.10.0git</string>
+ <string>2.0.0git</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2017 The ScummVM Team</string>
<key>NSPrincipalClass</key>
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index e6ec51c281..b728e9201b 100644
--- a/dists/openpandora/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -4,11 +4,11 @@
<package id="scummvm.djwillis.0001">
<author name="DJWillis" website="http://www.scummvm.org/"/>
<!-- version type can be alpha, beta or release, set to release in branch -->
- <version major="1" minor="10" release="0" build="1" type="release"/>
+ <version major="2" minor="0" release="0" build="1" type="release"/>
<!-- Both title and titles are needed -->
- <title lang="en_US">ScummVM 1.10.0git</title>
+ <title lang="en_US">ScummVM 2.0.0git</title>
<titles>
- <title lang="en_US">ScummVM 1.10.0git</title>
+ <title lang="en_US">ScummVM 2.0.0git</title>
</titles>
<descriptions>
<description lang="en_US">
@@ -25,7 +25,7 @@
<exec command="./runscummvm.sh"/>
<author name="DJWillis" website="http://www.scummvm.org/"/>
<!-- version type can be alpha, beta or release, set to release in branch -->
- <version major="1" minor="10" release="0" build="1" type="release"/>
+ <version major="2" minor="0" release="0" build="1" type="release"/>
<!-- Both title and titles are needed -->
<title lang="en_US">ScummVM</title>
<titles>
diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index d5f6c473df..daa3197146 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 1.10.0git - OPENPANDORA SPECIFIC README
+ScummVM 2.0.0git - OPENPANDORA SPECIFIC README
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 369ce669a9..0a1f4435e6 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 1.10.0git - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.0.0git - OPENPANDORA README - HOW TO INSTALL
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index efececaed5..6c241bdf8a 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
</h3>
<h4>
- <p>ScummVM 1.10.0git: OpenPandora Specific Documentation</p>
+ <p>ScummVM 2.0.0git: OpenPandora Specific Documentation</p>
</h4>
<A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
@@ -13,7 +13,7 @@
<A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
<h4>
- <p>ScummVM 1.10.0git: General Documentation</p>
+ <p>ScummVM 2.0.0git: General Documentation</p>
</h4>
<A href="http://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index a9ca021a65..40d191da78 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm-tools
-Version : 1.10.0git
+Version : 2.0.0git
Release : 1
Summary : ScummVM-related tools
Group : Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index b2b821a189..4e9d13fb4d 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm
-Version : 1.10.0git
+Version : 2.0.0git
Release : 1
Summary : Graphic adventure game interpreter
Group : Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index b286b449fa..fc6cb78b3c 100644
--- a/dists/riscos/!Boot,feb
+++ b/dists/riscos/!Boot,feb
@@ -5,4 +5,4 @@ Set ScummVM$Title "ScummVM"
Set ScummVM$Description "Play certain classic graphical point-and-click adventure games"
Set ScummVM$Publisher "ScummVM Developers"
Set ScummVM$Web "http://www.scummvm.org/"
-Set ScummVM$Version "1.10.0git"
+Set ScummVM$Version "2.0.0git"
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index e926382aa9..89c1905026 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -73,8 +73,8 @@ pred.dic FILE "dists/pred.dic"
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,10,0,0
- PRODUCTVERSION 1,10,0,0
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -92,13 +92,13 @@ BEGIN
VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
VALUE "CompanyName", "scummvm.org\0"
VALUE "FileDescription", "http://www.scummvm.org/\0"
- VALUE "FileVersion", "1.10.0git\0"
+ VALUE "FileVersion", "2.0.0git\0"
VALUE "InternalName", "scummvm\0"
VALUE "LegalCopyright", "Copyright © 2001-2017 The ScummVM Team\0"
VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
VALUE "OriginalFilename", "scummvm.exe\0"
VALUE "ProductName", "ScummVM\0"
- VALUE "ProductVersion", "1.10.0git\0"
+ VALUE "ProductVersion", "2.0.0git\0"
END
END
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 527f567a57..4a20d01fab 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then
fi
PKG=$TMP/package-scummvm
-VERSION=1.10.0git
+VERSION=2.0.0git
ARCH=i486
BUILD=1
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index 1cd2e36e42..e961fd16f9 100644
--- a/dists/wii/meta.xml
+++ b/dists/wii/meta.xml
@@ -2,7 +2,7 @@
<app version="1">
<name>ScummVM</name>
<coder>The ScummVM Team</coder>
- <version>1.10.0git@REVISION@</version>
+ <version>2.0.0git@REVISION@</version>
<release_date>@TIMESTAMP@</release_date>
<short_description>Point &amp; Click Adventures</short_description>
<long_description>ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
diff --git a/doc/de/NEUES b/doc/de/NEUES
index da0fcff4c1..05a769e4ce 100644
--- a/doc/de/NEUES
+++ b/doc/de/NEUES
@@ -2,7 +2,7 @@ Umfangreichere Informationen über die Änderungen des aktuellen experimentellen
Programmcodes finden Sie auf Englisch unter:
https://github.com/scummvm/scummvm/commits/
-1.10.0 (DD.MM.YYYY)
+2.0.0 (DD.MM.YYYY)
Neue Spiele:
- Unterstützung für Full Pipe hinzugefügt.
- Unterstützung für Hi-Res Adventure #3: Cranston Manor hinzugefügt.