From ec65a2d16d68ea7ced520631e7a3700ff7ac78e7 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Thu, 12 Jan 2012 19:24:27 +0200
Subject: [PATCH] =?UTF-8?q?lsnes=20rr1-=CE=B27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION    |  2 +-
 manual.lyx | 12 ++++++++++++
 manual.txt |  6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b245ba26..8c533245 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1-β6
+1-β7
diff --git a/manual.lyx b/manual.lyx
index 7c6489f0..98c747c6 100644
--- a/manual.lyx
+++ b/manual.lyx
@@ -4929,5 +4929,17 @@ rr1-beta6
 Win32: Fix compile errors.
 \end_layout
 
+\begin_layout Subsection
+rr1-beta7
+\end_layout
+
+\begin_layout Itemize
+Refactor controller input code.
+\end_layout
+
+\begin_layout Itemize
+Fix crash when using command line on SDL / Mac OS X.
+\end_layout
+
 \end_body
 \end_document
diff --git a/manual.txt b/manual.txt
index c5043071..cb7f65a9 100644
--- a/manual.txt
+++ b/manual.txt
@@ -2391,3 +2391,9 @@ set-axis joystick0axis19 disabled
 
 • Win32: Fix compile errors.
 
+14.36 rr1-beta7
+
+• Refactor controller input code.
+
+• Fix crash when using command line on SDL / Mac OS X.
+