From eaf5ebd0deb15679c681b20262108b62ac893f49 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Thu, 9 Apr 2009 05:22:40 +0000
Subject: [PATCH] merge 1863 into 0.9.2

---
 ChangeLog   | 30 +++++++++++++++++++++++++++++-
 src/types.h | 10 +++++-----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 99b5af790..6b2f8c5e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,34 @@
-0.9.1 -> ?
+0.9.1 -> 0.9.2
+General/Core:
+ bug: fix error in SBCS/RSCS flags; fixes many odd behaviors and crashes [zeromus]
+ bug: add support for sleep mode and power registers [luigi__]
+ bug: important fixes to RTC so correct time is actually told [luigi__]
+ bug: fix card reads below 0x8000; fixes some game freezes [normatt]
+ bug: fix 4 mbit save type; fix non-autodetect savefile dumping [zeromus, matusz]
+ enh: add sram to GBA game addon emulation for importing savefiles [zeromus]
+ enh: many improvements and feature hookups in linux ports [matusz, luigi__]
+ 
+Graphics:
+ bug: fix specular texture mapping mode [luigi__]
+ bug: repairs to some capture modes and vram mapping [zeromus, CrazyMax]
+ bug: viewports finally correctly handled [zeromus]
+ enh: add software rasterizer. quirky, but on par with opengl [zeromus]
+ 
+Windows:
+ bug: mitigate bad frameskipper; default to old frameskipping mode [zeromus]
+ bug: fixes with recent roms and zipfile loading [zeromus]
+ bug: fix window position memory [zeromus]
+ enh: bios and firmware may now be used and booted [luigi__]
+ enh: many display, OSD, and input enhancements [luigi__]
+ enh: brand new hotkey and controls binding system [zeromus]
+ enh: configurable screen separation [luigi__]
+ enh: fast forward key [pa__]
+ enh: improvements to mic [luigi__]
+ enh: faster updates in debug tools, up to once per frame [pa__]
+
 Mac OS X Port:
  enh: added Italian translation thanks to Paolo Bernini [jeff]
+ enh: resurrection of GDB stub [sigmaris]
 
 0.9 -> 0.9.1
 General/Core:
diff --git a/src/types.h b/src/types.h
index 935453420..d1386b7ce 100644
--- a/src/types.h
+++ b/src/types.h
@@ -22,7 +22,7 @@
 
 //--------------
 //configuration
-//#define DEVELOPER
+#define DEVELOPER
 //--------------
 
 #define DESMUME_NAME "DeSmuME"
@@ -43,11 +43,11 @@
 #define DESMUME_CPUEXT_STRING ""
 #endif
 
-#ifdef DEVELOPER
-#define DESMUME_FEATURE_STRING " dev+"
-#else
+//#ifdef DEVELOPER
+//#define DESMUME_FEATURE_STRING " dev+"
+//#else
 #define DESMUME_FEATURE_STRING ""
-#endif
+//#endif
 
 #ifdef DEBUG
 #define DESMUME_SUBVERSION_STRING " debug"