Merge branch 'rr1-maint'

bsnes-patches/v084/0008-Add-needed-support-for-detecting-true-polls-as-oppos.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Add needed support for detecting true polls as opposed to
  just autopolling
 
 ---
- bsnes/snes/cpu/cpu.hpp       |    1 +
- bsnes/snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
+ snes/cpu/cpu.hpp       |    1 +
+ snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-diff --git a/bsnes/snes/cpu/cpu.hpp b/bsnes/snes/cpu/cpu.hpp
+diff --git a/snes/cpu/cpu.hpp b/snes/cpu/cpu.hpp
 index 67a56d1..976a4a6 100755
---- a/bsnes/snes/cpu/cpu.hpp
-+++ b/bsnes/snes/cpu/cpu.hpp
+--- a/snes/cpu/cpu.hpp
++++ b/snes/cpu/cpu.hpp
 @@ -25,6 +25,7 @@ struct CPU : public Processor, public CPUcore, public PPUcounter {
    CPU();
    ~CPU();
@@ -21,10 +21,10 @@ index 67a56d1..976a4a6 100755
  private:
    #include "dma/dma.hpp"
    #include "memory/memory.hpp"
-diff --git a/bsnes/snes/cpu/mmio/mmio.cpp b/bsnes/snes/cpu/mmio/mmio.cpp
+diff --git a/snes/cpu/mmio/mmio.cpp b/snes/cpu/mmio/mmio.cpp
 index 8b6aaa6..c5ee930 100755
---- a/bsnes/snes/cpu/mmio/mmio.cpp
-+++ b/bsnes/snes/cpu/mmio/mmio.cpp
+--- a/snes/cpu/mmio/mmio.cpp
++++ b/snes/cpu/mmio/mmio.cpp
 @@ -42,6 +42,7 @@ void CPU::mmio_w4016(uint8 data) {
  //1-0 = Joypad serial data
  uint8 CPU::mmio_r4016() {

bsnes-patches/v085/0009-Add-needed-support-for-detecting-true-polls-as-oppos.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Add needed support for detecting true polls as opposed to
  just autopolling
 
 ---
- bsnes/snes/cpu/cpu.hpp       |    1 +
- bsnes/snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
+ snes/cpu/cpu.hpp       |    1 +
+ snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-diff --git a/bsnes/snes/cpu/cpu.hpp b/bsnes/snes/cpu/cpu.hpp
+diff --git a/snes/cpu/cpu.hpp b/snes/cpu/cpu.hpp
 index 3da865e..4944577 100755
---- a/bsnes/snes/cpu/cpu.hpp
-+++ b/bsnes/snes/cpu/cpu.hpp
+--- a/snes/cpu/cpu.hpp
++++ b/snes/cpu/cpu.hpp
 @@ -25,6 +25,7 @@ struct CPU : public Processor, public CPUcore, public PPUcounter {
    CPU();
    ~CPU();
@@ -21,10 +21,10 @@ index 3da865e..4944577 100755
  private:
    #include "dma/dma.hpp"
    #include "memory/memory.hpp"
-diff --git a/bsnes/snes/cpu/mmio/mmio.cpp b/bsnes/snes/cpu/mmio/mmio.cpp
+diff --git a/snes/cpu/mmio/mmio.cpp b/snes/cpu/mmio/mmio.cpp
 index 8b6aaa6..c5ee930 100755
---- a/bsnes/snes/cpu/mmio/mmio.cpp
-+++ b/bsnes/snes/cpu/mmio/mmio.cpp
+--- a/snes/cpu/mmio/mmio.cpp
++++ b/snes/cpu/mmio/mmio.cpp
 @@ -42,6 +42,7 @@ void CPU::mmio_w4016(uint8 data) {
  //1-0 = Joypad serial data
  uint8 CPU::mmio_r4016() {

bsnes-patches/v085/0010-Fix-compiling-on-GCC-4.7.patch

@@ -4,13 +4,13 @@ Date: Sun, 14 Oct 2012 23:31:36 +0300
 Subject: [PATCH] Fix compiling on GCC 4.7
 
 ---
- bsnes/nall/string.hpp |    2 +-
+ nall/string.hpp |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/bsnes/nall/string.hpp b/bsnes/nall/string.hpp
+diff --git a/nall/string.hpp b/nall/string.hpp
 index 1b255ce..07a64df 100755
---- a/bsnes/nall/string.hpp
-+++ b/bsnes/nall/string.hpp
+--- a/nall/string.hpp
++++ b/nall/string.hpp
 @@ -25,8 +25,8 @@
  #include <nall/string/base.hpp>
  #include <nall/string/bml.hpp>

bsnes-patches/v086/0005-Add-needed-support-for-detecting-true-polls-as-oppos.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Add needed support for detecting true polls as opposed to
  just autopolling
 
 ---
- bsnes/snes/cpu/cpu.hpp       |    1 +
- bsnes/snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
+ snes/cpu/cpu.hpp       |    1 +
+ snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-diff --git a/bsnes/snes/cpu/cpu.hpp b/bsnes/snes/cpu/cpu.hpp
+diff --git a/snes/cpu/cpu.hpp b/snes/cpu/cpu.hpp
 index 5eb963e..f6466cc 100755
---- a/bsnes/snes/cpu/cpu.hpp
-+++ b/bsnes/snes/cpu/cpu.hpp
+--- a/snes/cpu/cpu.hpp
++++ b/snes/cpu/cpu.hpp
 @@ -25,6 +25,7 @@ struct CPU : public Processor, public CPUcore, public PPUcounter {
    CPU();
    ~CPU();
@@ -21,10 +21,10 @@ index 5eb963e..f6466cc 100755
  privileged:
    #include "dma/dma.hpp"
    #include "memory/memory.hpp"
-diff --git a/bsnes/snes/cpu/mmio/mmio.cpp b/bsnes/snes/cpu/mmio/mmio.cpp
+diff --git a/snes/cpu/mmio/mmio.cpp b/snes/cpu/mmio/mmio.cpp
 index 8b6aaa6..c5ee930 100755
---- a/bsnes/snes/cpu/mmio/mmio.cpp
-+++ b/bsnes/snes/cpu/mmio/mmio.cpp
+--- a/snes/cpu/mmio/mmio.cpp
++++ b/snes/cpu/mmio/mmio.cpp
 @@ -42,6 +42,7 @@ void CPU::mmio_w4016(uint8 data) {
  //1-0 = Joypad serial data
  uint8 CPU::mmio_r4016() {

bsnes-patches/v086/0006-Fix-compiling-on-GCC-4.7.patch

@@ -4,14 +4,14 @@ Date: Sun, 14 Oct 2012 23:29:40 +0300
 Subject: [PATCH] Fix compiling on GCC 4.7
 
 ---
- bsnes/nall/string.hpp        |    2 +-
- bsnes/ui-libsnes/libsnes.cpp |    1 +
+ nall/string.hpp        |    2 +-
+ ui-libsnes/libsnes.cpp |    1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/bsnes/nall/string.hpp b/bsnes/nall/string.hpp
+diff --git a/nall/string.hpp b/nall/string.hpp
 index 996cd68..4747e4c 100755
---- a/bsnes/nall/string.hpp
-+++ b/bsnes/nall/string.hpp
+--- a/nall/string.hpp
++++ b/nall/string.hpp
 @@ -25,8 +25,8 @@
  #include <nall/string/base.hpp>
  #include <nall/string/bml.hpp>
@@ -22,10 +22,10 @@ index 996cd68..4747e4c 100755
  #include <nall/string/compare.hpp>
  #include <nall/string/convert.hpp>
  #include <nall/string/cstring.hpp>
-diff --git a/bsnes/ui-libsnes/libsnes.cpp b/bsnes/ui-libsnes/libsnes.cpp
+diff --git a/ui-libsnes/libsnes.cpp b/ui-libsnes/libsnes.cpp
 index 3b2be7a..ca90762 100755
---- a/bsnes/ui-libsnes/libsnes.cpp
-+++ b/bsnes/ui-libsnes/libsnes.cpp
+--- a/ui-libsnes/libsnes.cpp
++++ b/ui-libsnes/libsnes.cpp
 @@ -1,5 +1,6 @@
  #include "libsnes.hpp"
  #include <snes/snes.hpp>

bsnes-patches/v087/0005-Add-needed-support-for-detecting-true-polls-as-oppos.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Add needed support for detecting true polls as opposed to
  just autopolling
 
 ---
- bsnes/snes/cpu/cpu.hpp       |    1 +
- bsnes/snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
+ snes/cpu/cpu.hpp       |    1 +
+ snes/cpu/mmio/mmio.cpp |   18 ++++++++++--------
  2 files changed, 11 insertions(+), 8 deletions(-)
 
-diff --git a/bsnes/snes/cpu/cpu.hpp b/bsnes/snes/cpu/cpu.hpp
+diff --git a/snes/cpu/cpu.hpp b/snes/cpu/cpu.hpp
 index 5eb963e..f6466cc 100755
---- a/bsnes/snes/cpu/cpu.hpp
-+++ b/bsnes/snes/cpu/cpu.hpp
+--- a/snes/cpu/cpu.hpp
++++ b/snes/cpu/cpu.hpp
 @@ -25,6 +25,7 @@ struct CPU : public Processor, public CPUcore, public PPUcounter {
    CPU();
    ~CPU();
@@ -21,10 +21,10 @@ index 5eb963e..f6466cc 100755
  privileged:
    #include "dma/dma.hpp"
    #include "memory/memory.hpp"
-diff --git a/bsnes/snes/cpu/mmio/mmio.cpp b/bsnes/snes/cpu/mmio/mmio.cpp
+diff --git a/snes/cpu/mmio/mmio.cpp b/snes/cpu/mmio/mmio.cpp
 index 8b6aaa6..c5ee930 100755
---- a/bsnes/snes/cpu/mmio/mmio.cpp
-+++ b/bsnes/snes/cpu/mmio/mmio.cpp
+--- a/snes/cpu/mmio/mmio.cpp
++++ b/snes/cpu/mmio/mmio.cpp
 @@ -42,6 +42,7 @@ void CPU::mmio_w4016(uint8 data) {
  //1-0 = Joypad serial data
  uint8 CPU::mmio_r4016() {

bsnes-patches/v087/0006-Add-missing-include-to-libsnes.cpp.patch

@@ -4,13 +4,13 @@ Date: Sun, 14 Oct 2012 23:25:33 +0300
 Subject: [PATCH] Add missing include to libsnes.cpp
 
 ---
- bsnes/target-libsnes/libsnes.cpp |    1 +
+ target-libsnes/libsnes.cpp |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/bsnes/target-libsnes/libsnes.cpp b/bsnes/target-libsnes/libsnes.cpp
+diff --git a/target-libsnes/libsnes.cpp b/target-libsnes/libsnes.cpp
 index 3b2be7a..ca90762 100755
---- a/bsnes/target-libsnes/libsnes.cpp
-+++ b/bsnes/target-libsnes/libsnes.cpp
+--- a/target-libsnes/libsnes.cpp
++++ b/target-libsnes/libsnes.cpp
 @@ -1,5 +1,6 @@
  #include "libsnes.hpp"
  #include <snes/snes.hpp>