Merge branch 'release/6.0' of https://github.com/stella-emu/stella into release/6.0

src/common/Version.hxx

@@ -19,6 +19,6 @@
 #define VERSION_HXX
 
 #define STELLA_VERSION "6.0_pre1"
-#define STELLA_BUILD "4430"
+#define STELLA_BUILD "4434"
 
 #endif

src/emucore/tia/Ball.cxx

@@ -65,8 +65,6 @@ void Ball::enabl(uInt8 value)
     myTIA->flushLineCache();
 
     updateEnabled();
-    collision = (myIsVisible && myIsEnabled) ? myCollisionMaskEnabled : myCollisionMaskDisabled;
-    myTIA->scheduleCollisionUpdate();
   }
 }
 

src/macosx/Info-Stella.plist

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