[Scummvm-cvs-logs] scummvm-tools master -> c64cfda00f48cf87a82a4bd1f5dfb4c9a88b71b8
criezy
criezy at scummvm.org
Fri Jan 1 15:07:31 CET 2016
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:
326771eeb3 ALL: Update copyright years
c64cfda00f ALL: Update copyright years and ScummVM Tools version
Commit: 326771eeb33cb915c6773657921b5b2b46ec98ab
https://github.com/scummvm/scummvm-tools/commit/326771eeb33cb915c6773657921b5b2b46ec98ab
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-01-01T14:06:44Z
Commit Message:
ALL: Update copyright years
Changed paths:
COPYRIGHT
convert_dxa.bat
convert_dxa.sh
dists/win32/ScummVM Tools.iss
engines/mohawk/utils/file.cpp
engines/mohawk/utils/file.h
engines/mohawk/utils/stream.h
gui/main.cpp
diff --git a/COPYRIGHT b/COPYRIGHT
index 4ccd886..ebeb385 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
ScummVM Tools
-Copyright (C) 2001-2015 by the following:
+Copyright (C) 2001-2016 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 131f905..c631e6d 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-2012 ScummVM Team
+:: (c) 2006-2016 ScummVM Team
:: (c) 2006 oduverne
:: (c) 2008 NoiZe
::
diff --git a/convert_dxa.sh b/convert_dxa.sh
index 5d4d62e..dc117c0 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-2012 ScummVM Team
+# (c) 2006-2016 ScummVM Team
# (c) 2006 crowley
#
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index 2bded35..d022fd8 100755
--- a/dists/win32/ScummVM Tools.iss
+++ b/dists/win32/ScummVM Tools.iss
@@ -1,5 +1,5 @@
[Setup]
-AppCopyright=2012
+AppCopyright=2016
AppName=ScummVM Tools
AppVerName=ScummVM Tools Git
AppPublisher=The ScummVM Team
diff --git a/engines/mohawk/utils/file.cpp b/engines/mohawk/utils/file.cpp
index 2567e69..5e8f526 100644
--- a/engines/mohawk/utils/file.cpp
+++ b/engines/mohawk/utils/file.cpp
@@ -1,5 +1,8 @@
/* Scumm Tools
- * Copyright (C) 2004-2006 The ScummVM Team
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -14,10 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/branches/gsoc2009-gui/utils/file.cpp $
- * $Id: file.cpp 23138 2006-06-15 15:44:06Z h00ligan $
- *
*/
#include "common/util.h"
diff --git a/engines/mohawk/utils/file.h b/engines/mohawk/utils/file.h
index 4cd18b2..812d375 100644
--- a/engines/mohawk/utils/file.h
+++ b/engines/mohawk/utils/file.h
@@ -1,5 +1,8 @@
/* Scumm Tools
- * Copyright (C) 2004-2006 The ScummVM Team
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -14,10 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/branches/gsoc2009-gui/utils/file.h $
- * $Id: file.h 23138 2006-06-15 15:44:06Z h00ligan $
- *
*/
#ifndef COMMON_FILE_H
diff --git a/engines/mohawk/utils/stream.h b/engines/mohawk/utils/stream.h
index 29944fd..4d15ac1 100644
--- a/engines/mohawk/utils/stream.h
+++ b/engines/mohawk/utils/stream.h
@@ -1,5 +1,8 @@
/* Scumm Tools
- * Copyright (C) 2004-2006 The ScummVM Team
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -14,10 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/tools/branches/gsoc2009-gui/utils/stream.h $
- * $Id: stream.h 40868 2009-05-24 15:19:28Z lordhoto $
- *
*/
#ifndef COMMON_STREAM_H
diff --git a/gui/main.cpp b/gui/main.cpp
index 848bd05..4f28ba3 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-2012"));
+ wxStaticText *copyrighttext = new wxStaticText(dialog, wxID_ANY, wxT("Copyright ScummVM Team 2009-2016"));
copyrighttext->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("Arial")));
sizer->Add(copyrighttext, wxSizerFlags());
Commit: c64cfda00f48cf87a82a4bd1f5dfb4c9a88b71b8
https://github.com/scummvm/scummvm-tools/commit/c64cfda00f48cf87a82a4bd1f5dfb4c9a88b71b8
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-01-01T14:07:10Z
Commit Message:
ALL: Update copyright years and ScummVM Tools version
Changed paths:
dists/macosx/Info.plist
dists/macosx/Info.plist.in
dists/scummvmtools.rc
dists/scummvmtools.rc.in
dists/win32/scummvm-tools.nsi
dists/win32/scummvm-tools.nsi.in
internal_version.h
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index d4a2947..ab0c9c1 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.7.0git, Copyright 2001-2012 The ScummVM team</string>
+ <string>1.8.0git, Copyright 2001-2016 The ScummVM team</string>
<key>CFBundleIconFile</key>
<string>scummvmtools.icns</string>
<key>CFBundleIdentifier</key>
@@ -21,12 +21,12 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.7.0git</string>
+ <string>1.8.0git</string>
<key>CFBundleVersion</key>
- <string>1.7.0git</string>
+ <string>1.8.0git</string>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2012 The ScummVM team</string>
+ <string>Copyright 2001-2016 The ScummVM team</string>
</dict>
</plist>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 5cd0c61..68d9241 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-2012 The ScummVM team</string>
+ <string>@VERSION@, Copyright 2001-2016 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-2012 The ScummVM team</string>
+ <string>Copyright 2001-2016 The ScummVM team</string>
</dict>
</plist>
diff --git a/dists/scummvmtools.rc b/dists/scummvmtools.rc
index 9f4d14f..d422283 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,7,0,0
- PRODUCTVERSION 1,7,0,0
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,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.7.0git\0"
+ VALUE "FileVersion", "1.8.0git\0"
VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2012 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2016 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.7.0git\0"
+ VALUE "ProductVersion", "1.8.0git\0"
END
END
diff --git a/dists/scummvmtools.rc.in b/dists/scummvmtools.rc.in
index 7c17a03..67fb030 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-2012 The ScummVM Team\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2016 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.nsi b/dists/win32/scummvm-tools.nsi
index 2006cad..e29a0fe 100644
--- a/dists/win32/scummvm-tools.nsi
+++ b/dists/win32/scummvm-tools.nsi
@@ -61,11 +61,11 @@ Name "ScummVM Tools"
# General Symbol Definitions
#########################################################################################
!define REGKEY "Software\ScummVM\$(^Name)"
-!define VERSION "1.7.0git"
+!define VERSION "1.8.0git"
!define COMPANY "ScummVM Team"
!define URL "http://scummvm.org/"
!define DESCRIPTION "ScummVM Tools Installer. Look! A three headed monkey (TM)!"
-!define COPYRIGHT "Copyright © 2001-2012 The ScummVM Team"
+!define COPYRIGHT "Copyright © 2001-2016 The ScummVM Team"
#########################################################################################
# Installer configuration
@@ -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.7.0.0
+VIProductVersion 1.8.0.0
VIAddVersionKey ProductName $(^Name)
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/dists/win32/scummvm-tools.nsi.in b/dists/win32/scummvm-tools.nsi.in
index c6135aa..89db12d 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-2012 The ScummVM Team"
+!define COPYRIGHT "Copyright © 2001-2016 The ScummVM Team"
#########################################################################################
# Installer configuration
diff --git a/internal_version.h b/internal_version.h
index 9c2ddb7..c33c953 100644
--- a/internal_version.h
+++ b/internal_version.h
@@ -2,4 +2,4 @@
#define SCUMMVM_TOOLS_SVN_REVISION
#endif
-#define SCUMMVM_TOOLS_VERSION "1.7.0git" SCUMMVM_TOOLS_SVN_REVISION
+#define SCUMMVM_TOOLS_VERSION "1.8.0git" SCUMMVM_TOOLS_SVN_REVISION
More information about the Scummvm-git-logs
mailing list