Merge branch 'rr1-maint' into rr1-gambatte

Conflicts: VERSION
2012-09-01 11:48:28 +03:00 · 2012-09-01 11:48:28 +03:00 · b8bc77fc4c
commit b8bc77fc4c
parent 3c372067e6 18efb3b235
3 changed files with 19 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-1-Δ13-gb0
+1-Δ13ε1-gb0
--- a/manual.lyx
+++ b/manual.lyx
@ -6379,5 +6379,17 @@ Standalone hotkey config dialog
 Show bindings in more user-friendly format
 \end_layout

+\begin_layout Subsection
+rr1-delta13epsilon1
+\end_layout
+
+\begin_layout Itemize
+Pipedec support
+\end_layout
+
+\begin_layout Itemize
+Fix uninitialized variables in bsnes v085
+\end_layout
+
 \end_body
 \end_document
--- a/manual.txt
+++ b/manual.txt
@ -3134,3 +3134,9 @@ set-axis joystick0axis19 disabled

 • Show bindings in more user-friendly format

+17.69 rr1-delta13epsilon1
+
+• Pipedec support
+
+• Fix uninitialized variables in bsnes v085
+