Merge remote-tracking branch 'remotes/upstream/git-svn'

This commit is contained in:
Christian Speckner 2016-11-26 14:48:40 +01:00
commit 4fd2c71510
10 changed files with 34 additions and 22 deletions

View File

@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 4.7.2 for Linux, MacOSX and Windows
Release 4.7.3 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@ -21,30 +21,30 @@ all of your favourite Atari 2600 games again! Stella was originally
developed for Linux by Bradford W. Mott, however, it has been ported to a
number of other platforms and is currently maintained by Stephen Anthony.
This is the 4.7.2 release of Stella for Linux, Mac OSX and Windows. The
This is the 4.7.3 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP_SP3(*)/Vista/7/8/10 :
Stella-4.7.2-win32.exe (32-bit EXE installer)
Stella-4.7.2-x64.exe (64-bit EXE installer)
Stella-4.7.2-windows.zip (32/64 bit versions)
Stella-4.7.3-win32.exe (32-bit EXE installer)
Stella-4.7.3-x64.exe (64-bit EXE installer)
Stella-4.7.3-windows.zip (32/64 bit versions)
(*) Note: Support for Windows XP is problematic on some systems,
and will probably be discontinued in a future release.
* Binary distribution for MacOS X 10.7 and above :
Stella-4.7.2-macosx.dmg (64-bit Intel)
Stella-4.7.3-macosx.dmg (64-bit Intel)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_4.7.2-1_i386.deb
stella_4.7.2-1_amd64.deb
stella_4.7.3-1_i386.deb
stella_4.7.3-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
stella-4.7.2-2.i386.rpm
stella-4.7.2-2.x86_64.rpm
stella-4.7.3-2.i386.rpm
stella-4.7.3-2.x86_64.rpm
* Source code distribution for all platforms :
stella-4.7.2-src.tar.xz
stella-4.7.3-src.tar.xz
Distribution Site

View File

@ -12,7 +12,7 @@
Release History
===========================================================================
4.7.2 to 4.8: (xxx. xx, 2016)
4.7.2 to 4.7.3: (Nov. 21, 2016)
* Added preliminary support for the 3E+ bankswitching scheme, developed
by Thomas Jentzsch.

2
configure vendored
View File

@ -397,7 +397,7 @@ if test "$have_clang" = yes; then
fi
case $cxx_version in
[3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*)
[3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9])
_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
cxx_version="$cxx_version, ok"

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
stella (4.7.3-1) stable; urgency=high
* Version 4.7.3 release
-- Stephen Anthony <stephena@users.sf.net> Mon, 21 Nov 2016 17:09:59 -0230
stella (4.7.2-1) stable; urgency=high
* Version 4.7.2 release

View File

@ -623,7 +623,6 @@ can also get rid of all traps at once with the "cleartraps" command.</p>
<pre>
a - Set Accumulator to value xx
bank - Show # of banks, or switch to bank xx
base - Set default base (hex, dec, or bin)
break - Set/clear breakpoint at address xx (default=PC)
breakif - Set breakpoint on condition xx
@ -685,6 +684,9 @@ listfunctions - List user-defined functions
trap - Trap read/write access to address(es) xx [to yy]
trapread - Trap read access to address(es) xx [to yy]
trapwrite - Trap write access to address(es) xx [to yy]
trapm - Trap read/write access to address xx (+mirrors)
trapreadm - Trap read access to address xx (+mirrors)
trapwritem - Trap write access to address xx (+mirrors)
type - Show disassembly type for address xx [to yy]
uhex - Toggle upper/lowercase HEX display
undef - Undefine label xx (if defined)

View File

@ -10,7 +10,7 @@
<br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 4.7.2</b></h4></center>
<center><h4><b>Release 4.7.3</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>

View File

@ -22,7 +22,7 @@
#include <cstdlib>
#define STELLA_VERSION "4.8_pre"
#define STELLA_VERSION "4.7.3"
#define STELLA_BUILD atoi("$Rev$" + 6)
#endif

View File

@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
<string>4.7.2</string>
<string>4.7.3</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key>

View File

@ -1,5 +1,5 @@
%define name stella
%define version 4.7.2
%define version 4.7.3
%define rel 1
%define enable_sound 1
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png
%changelog
* Mon Nov 21 2016 Stephen Anthony <stephena@users.sf.net> 4.7.3-1
- Version 4.7.3 release
* Fri Mar 25 2016 Stephen Anthony <stephena@users.sf.net> 4.7.2-1
- Version 4.7.2 release

View File

@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,7,2,0
PRODUCTVERSION 4,7,2,0
FILEVERSION 4,7,3,0
PRODUCTVERSION 4,7,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -55,12 +55,12 @@ BEGIN
VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2."
VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
VALUE "FileDescription", "Stella"
VALUE "FileVersion", "4.7.2"
VALUE "FileVersion", "4.7.3"
VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2016 The Stella Team"
VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella"
VALUE "ProductVersion", "4.7.2"
VALUE "ProductVersion", "4.7.3"
END
END
BLOCK "VarFileInfo"