From 009fb5c91a0c63874af71a77696ac9eb04e210ee Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Sat, 4 Feb 2012 15:17:30 +0000
Subject: [PATCH] Getting ready for the next point release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2381 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 Changes.txt            | 8 ++++++++
 src/common/Version.hxx | 2 +-
 src/emucore/M6532.cxx  | 2 +-
 src/emucore/M6532.hxx  | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Changes.txt b/Changes.txt
index 57ecdf6ee..ee19d23e3 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -60,9 +60,17 @@
   * Added 'FA2' bankswitch scheme, thanks to code from Chris D.
     Walton.  This scheme will be used in an upcoming 'Star Castle' ROM.
 
+  * Updated internal ROM properties database to ROM-Hunter version 7
+    (thanks go to RomHunter for his tireless research in this area).
+
+  * Added several PERL tools to help in automation of analyzing RomHunter
+    ROM set releases.
+
   * Fixed compile issues in Irix when using the default compiler
     instead of gcc.  Thanks go to Rainer M. Canavan for this code.
 
+  * Updated included PNG library to latest stable version.
+
 -Have fun!
 
 
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 6a6ee0c17..e4438fcd9 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.5.5_pre1"
+#define STELLA_VERSION "3.5.5_pre2"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif
diff --git a/src/emucore/M6532.cxx b/src/emucore/M6532.cxx
index 7f16c1908..5ef947a58 100644
--- a/src/emucore/M6532.cxx
+++ b/src/emucore/M6532.cxx
@@ -119,7 +119,7 @@ uInt8 M6532::peek(uInt16 addr)
   {
     case 0x00:    // SWCHA - Port A I/O Register (Joystick)
     {
-      uInt8 value = (myConsole.controller(Controller::Left).read() << 4)|
+      uInt8 value = (myConsole.controller(Controller::Left).read() << 4) |
                      myConsole.controller(Controller::Right).read();
 
       // Each pin is high (1) by default and will only go low (0) if either
diff --git a/src/emucore/M6532.hxx b/src/emucore/M6532.hxx
index 70d756df4..5d0f7b503 100644
--- a/src/emucore/M6532.hxx
+++ b/src/emucore/M6532.hxx
@@ -47,7 +47,7 @@ class M6532 : public Device
       Create a new 6532 for the specified console
 
       @param console  The console the 6532 is associated with
-      @param randRam  Randomize or zero RAM on reset
+      @param settings The settings used by the system
     */
     M6532(const Console& console, const Settings& settings);