Merge branch 'master' of https://github.com/stella-emu/stella

2017-12-20 21:32:27 +01:00 · 2017-12-20 21:32:27 +01:00 · ff1911a85d
parent e3baeb209e c6acb622cc
commit ff1911a85d
4 changed files with 516 additions and 461 deletions
--- a/src/common/StateManager.cxx
+++ b/src/common/StateManager.cxx
@ -27,7 +27,7 @@

 #include "StateManager.hxx"

-#define STATE_HEADER "05000304state"
+#define STATE_HEADER "05009901state"
 // #define MOVIE_HEADER "03030000movie"

 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/src/emucore/Cart.cxx
+++ b/src/emucore/Cart.cxx
@ -116,4 +116,3 @@ bool Cartridge::randomStartBank() const
 {
  return mySettings.getBool(mySettings.getBool("dev.settings") ? "dev.bankrandom" : "plr.bankrandom");
 }
-
--- a/src/emucore/DefProps.hxx
+++ b/src/emucore/DefProps.hxx
--- a/src/emucore/stella.pro
+++ b/src/emucore/stella.pro