From a26de8a0812a29e38f6ec8a22a7a46fbc32b2b76 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Wed, 19 Mar 2014 18:23:57 +0200
Subject: [PATCH] =?utf8?q?lsnes=20rr2-=CE=B218?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG | 20 ++++++++++++++++++++
 VERSION   |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0da9a73b..698eda3f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1708,3 +1708,23 @@ rr2-β17 [Friday February 28th 2014]
 * New projects menu
 * C interface
 * Fix exact core matching when loading projects
+
+rr2-β18 [Wednesday March 19th 2014]
+===================================
+* bsnes core: Raise bus breaks against correct address
+* C interface: Fix lag counting without LSNES_CORE_CAP1_PFLAG
+* C interface: Check for value != 0, not for control != 0 for lag check
+* Fix core callbacks being undefined if loading ROM from cmdline
+* Fix compilation on Mac OS X
+* Fix mouse electronics test
+* Tweak new movie dialog layout a bit
+* Add JSON linter utility
+* Force some configuration windows to be larger
+* Correctly show axes as disabled even if offline
+* Don't double-close audio output
+* Fix deleting executing breakpoint
+* Lua: Get lag count function
+* Allow bsnes tracelogger to trace execution in controller registers
+* SNES: Fix disassembly of long offsets
+* Make setting/unsetting non-bus breaks much faster.
+* Optimize movie.find_frame()
diff --git a/VERSION b/VERSION
index ffe108db..2c663ca0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2-β17
+2-β18
-- 
2.11.4.GIT