Merge branch 'rr1-maint'

Conflicts:
	src/core/rom.cpp
	src/platform/wxwidgets/romselect.cpp

VERSION

@@ -1 +1 @@
-1-Δ5ε1
+1-Δ5ε2

include/core/controllerframe.hpp

@@ -781,10 +781,9 @@ public:
 	{
 		size_t offset = 0;
 		offset += system_serialize(backing, buf);
-		for(size_t i = 0; i < MAX_PORTS; i++) {
+		for(size_t i = 0; i < MAX_PORTS; i++)
 			offset += pinfo[i]->serialize(backing + offsets[i], buf + offset);
-			buf[offset++] = (i < MAX_PORTS - 1) ? '|' : '\0';
-		}
+		buf[offset++] = '\0';
 	}
 /**
  * Return copy with dedicated memory.

manual.lyx

@@ -5945,5 +5945,17 @@ Movieinfo: Fix display of port #2 type.
 Call on_input() after loadstate.
 \end_layout
 
+\begin_layout Subsection
+rr1-delta5epsilon2
+\end_layout
+
+\begin_layout Itemize
+Fix writing port2 data to movie.
+\end_layout
+
+\begin_layout Itemize
+Fix SRAM handling with Bsnes v087.
+\end_layout
+
 \end_body
 \end_document

manual.txt

@@ -2926,3 +2926,7 @@ set-axis joystick0axis19 disabled
 
 • Call on_input() after loadstate.
 
+15.55 rr1-delta5epsilon2
+
+• Fix writing port2 data to movie.
+