[Scummvm-git-logs] scummvm-tools master -> 8c7ce98cf843a9645ec3c7a9bd577dadaaae672b
criezy
criezy at scummvm.org
Fri Jan 13 23:12:44 CET 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
e3906209b5 TOOLS: Bump copyright year to 2017
8c7ce98cf8 TOOLS: Bump version to 1.10.0git
Commit: e3906209b590e9aded74c6eea288dc4ef3178a3c
https://github.com/scummvm/scummvm-tools/commit/e3906209b590e9aded74c6eea288dc4ef3178a3c
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-01-13T22:12:15Z
Commit Message:
TOOLS: Bump copyright year to 2017
Changed paths:
COPYRIGHT
convert_dxa.bat
convert_dxa.sh
dists/macosx/Info.plist
dists/macosx/Info.plist.in
dists/scummvmtools.rc
dists/scummvmtools.rc.in
dists/win32/ScummVM Tools.iss
dists/win32/scummvm-tools.nsi
dists/win32/scummvm-tools.nsi.in
gui/main.cpp
diff --git a/COPYRIGHT b/COPYRIGHT
index ebeb385..d1a86ee 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
ScummVM Tools
-Copyright (C) 2001-2016 by the following:
+Copyright (C) 2001-2017 by the following:
If you have contributed to this project then you deserve to be on this
list. Contact us and we'll add you.
diff --git a/convert_dxa.bat b/convert_dxa.bat
index c631e6d..cdbb277 100755
--- a/convert_dxa.bat
+++ b/convert_dxa.bat
@@ -4,7 +4,7 @@
:: This script will search for all SMK files in all subtree directories,
:: and encode them as DXA files next to the original files.
::
-:: (c) 2006-2016 ScummVM Team
+:: (c) 2006-2017 ScummVM Team
:: (c) 2006 oduverne
:: (c) 2008 NoiZe
::
diff --git a/convert_dxa.sh b/convert_dxa.sh
index dc117c0..d3f077d 100755
--- a/convert_dxa.sh
+++ b/convert_dxa.sh
@@ -5,7 +5,7 @@
# This script will search for all SMK files in all subtree directories,
# and encode them as DXA files next to the original files.
#
-# (c) 2006-2016 ScummVM Team
+# (c) 2006-2017 ScummVM Team
# (c) 2006 crowley
#
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 73f4596..4f95993 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm-tools</string>
<key>CFBundleGetInfoString</key>
- <string>1.8.0, Copyright 2001-2016 The ScummVM team</string>
+ <string>1.8.0, Copyright 2001-2017 The ScummVM team</string>
<key>CFBundleIconFile</key>
<string>scummvmtools.icns</string>
<key>CFBundleIdentifier</key>
@@ -27,6 +27,6 @@
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2016 The ScummVM team</string>
+ <string>Copyright 2001-2017 The ScummVM team</string>
</dict>
</plist>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 68d9241..fc21190 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm-tools</string>
<key>CFBundleGetInfoString</key>
- <string>@VERSION@, Copyright 2001-2016 The ScummVM team</string>
+ <string>@VERSION@, Copyright 2001-2017 The ScummVM team</string>
<key>CFBundleIconFile</key>
<string>scummvmtools.icns</string>
<key>CFBundleIdentifier</key>
@@ -27,6 +27,6 @@
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2016 The ScummVM team</string>
+ <string>Copyright 2001-2017 The ScummVM team</string>
</dict>
</plist>
diff --git a/dists/scummvmtools.rc b/dists/scummvmtools.rc
index e9422d6..9898cbc 100644
--- a/dists/scummvmtools.rc
+++ b/dists/scummvmtools.rc
@@ -30,7 +30,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "1.8.0\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2016 The ScummVM Team\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-tools.exe\0"
VALUE "ProductName", "ScummVM Tools\0"
diff --git a/dists/scummvmtools.rc.in b/dists/scummvmtools.rc.in
index 67fb030..7eb3737 100644
--- a/dists/scummvmtools.rc.in
+++ b/dists/scummvmtools.rc.in
@@ -30,7 +30,7 @@ BEGIN
VALUE "FileDescription", "http://www.scummvm.org/\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2016 The ScummVM Team\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-tools.exe\0"
VALUE "ProductName", "ScummVM Tools\0"
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index d022fd8..b28a4bd 100755
--- a/dists/win32/ScummVM Tools.iss
+++ b/dists/win32/ScummVM Tools.iss
@@ -1,5 +1,5 @@
[Setup]
-AppCopyright=2016
+AppCopyright=2017
AppName=ScummVM Tools
AppVerName=ScummVM Tools Git
AppPublisher=The ScummVM Team
diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi
index 5691c69..e339778 100644
--- a/dists/win32/scummvm-tools.nsi
+++ b/dists/win32/scummvm-tools.nsi
@@ -65,7 +65,7 @@ Name "ScummVM Tools"
!define COMPANY "ScummVM Team"
!define URL "http://scummvm.org/"
!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT "Copyright © 2001-2016 The ScummVM Team"
+!define COPYRIGHT "Copyright © 2001-2017 The ScummVM Team"
#########################################################################################
# Installer configuration
diff --git a/dists/win32/scummvm-tools.nsi.in b/dists/win32/scummvm-tools.nsi.in
index 89db12d..1f13af3 100644
--- a/dists/win32/scummvm-tools.nsi.in
+++ b/dists/win32/scummvm-tools.nsi.in
@@ -65,7 +65,7 @@ Name "ScummVM Tools"
!define COMPANY "ScummVM Team"
!define URL "http://scummvm.org/"
!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT "Copyright © 2001-2016 The ScummVM Team"
+!define COPYRIGHT "Copyright © 2001-2017 The ScummVM Team"
#########################################################################################
# Installer configuration
diff --git a/gui/main.cpp b/gui/main.cpp
index 4f28ba3..7493b75 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -125,7 +125,7 @@ void ScummVMToolsApp::OnAbout() {
wxHyperlinkCtrl *websitetext = new wxHyperlinkCtrl(dialog, wxID_ANY, wxT("http://www.scummvm.org"), wxT("http://www.scummvm.org"));
sizer->Add(websitetext, wxSizerFlags().Border(wxTOP, 5));
- wxStaticText *copyrighttext = new wxStaticText(dialog, wxID_ANY, wxT("Copyright ScummVM Team 2009-2016"));
+ wxStaticText *copyrighttext = new wxStaticText(dialog, wxID_ANY, wxT("Copyright ScummVM Team 2009-2017"));
copyrighttext->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("Arial")));
sizer->Add(copyrighttext, wxSizerFlags());
Commit: 8c7ce98cf843a9645ec3c7a9bd577dadaaae672b
https://github.com/scummvm/scummvm-tools/commit/8c7ce98cf843a9645ec3c7a9bd577dadaaae672b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-01-13T22:12:22Z
Commit Message:
TOOLS: Bump version to 1.10.0git
Changed paths:
dists/macosx/Info.plist
dists/scummvmtools.rc
dists/win32/scummvm-tools.nsi
internal_version.h
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 4f95993..49f9f3b 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm-tools</string>
<key>CFBundleGetInfoString</key>
- <string>1.8.0, Copyright 2001-2017 The ScummVM team</string>
+ <string>1.10.0git, Copyright 2001-2017 The ScummVM team</string>
<key>CFBundleIconFile</key>
<string>scummvmtools.icns</string>
<key>CFBundleIdentifier</key>
@@ -21,9 +21,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.8.0</string>
+ <string>1.10.0git</string>
<key>CFBundleVersion</key>
- <string>1.8.0</string>
+ <string>1.10.0git</string>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
diff --git a/dists/scummvmtools.rc b/dists/scummvmtools.rc
index 9898cbc..76b9ecd 100644
--- a/dists/scummvmtools.rc
+++ b/dists/scummvmtools.rc
@@ -10,8 +10,8 @@
IDI_ICON ICON DISCARDABLE "gui/media/scummvmtools.ico"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,0,0
- PRODUCTVERSION 1,8,0,0
+ FILEVERSION 1,10,0,0
+ PRODUCTVERSION 1,10,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
@@ -28,13 +28,13 @@ BEGIN
BEGIN
VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
VALUE "FileDescription", "http://www.scummvm.org/\0"
- VALUE "FileVersion", "1.8.0\0"
+ VALUE "FileVersion", "1.10.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-tools.exe\0"
VALUE "ProductName", "ScummVM Tools\0"
- VALUE "ProductVersion", "1.8.0\0"
+ VALUE "ProductVersion", "1.10.0git\0"
END
END
diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi
index e339778..a33ca0f 100644
--- a/dists/win32/scummvm-tools.nsi
+++ b/dists/win32/scummvm-tools.nsi
@@ -61,7 +61,7 @@ Name "ScummVM Tools"
# General Symbol Definitions
#########################################################################################
!define REGKEY "Software\ScummVM\$(^Name)"
-!define VERSION "1.8.0"
+!define VERSION "1.10.0git"
!define COMPANY "ScummVM Team"
!define URL "http://scummvm.org/"
!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
@@ -81,7 +81,7 @@ XPStyle on
#TargetMinimalOS 5.0 ; Minimal version of windows for installer: Windows 2000 or more recent
; (will build unicode installer with NSIS 2.50+)
-VIProductVersion 1.8.0.0
+VIProductVersion 1.10.0.0
VIAddVersionKey ProductName $(^Name)
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/internal_version.h b/internal_version.h
index ab7f855..fda8280 100644
--- a/internal_version.h
+++ b/internal_version.h
@@ -2,4 +2,4 @@
#define SCUMMVM_TOOLS_SVN_REVISION
#endif
-#define SCUMMVM_TOOLS_VERSION "1.8.0" SCUMMVM_TOOLS_SVN_REVISION
+#define SCUMMVM_TOOLS_VERSION "1.10.0git" SCUMMVM_TOOLS_SVN_REVISION
More information about the Scummvm-git-logs
mailing list