From 4b94cfeaa02077e46e398c085e0c7f4cd778d706 Mon Sep 17 00:00:00 2001
From: yabause <yabause@users.sf.net>
Date: Mon, 2 Feb 2009 22:00:33 +0000
Subject: [PATCH] Merged 1584 and updated version number for autotools based
 ports and cocoa.

---
 configure.ac         | 2 +-
 src/Makefile.am      | 2 +-
 src/cocoa/Info.plist | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d4ad21423..32cd660b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl --- Package name is first argument to AC_INIT
 dnl --- Release version is second argument to AC_INIT
 
-AC_INIT(desmume, [svn])
+AC_INIT(desmume, [0.9.1])
 
 dnl -- find target architecture for some os specific libraries
 AC_CANONICAL_TARGET
diff --git a/src/Makefile.am b/src/Makefile.am
index 8fb34e4e7..eaf6770d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,7 @@ libdesmume_a_SOURCES = \
 	utils/md5.cpp utils/md5.h utils/valuearray.h utils/xstring.cpp utils/xstring.h \
 	utils/decrypt/crc.cpp utils/decrypt/crc.h utils/decrypt/decrypt.cpp \
 	utils/decrypt/decrypt.h utils/decrypt/header.cpp utils/decrypt/header.h \
-	addons.c addons.h \
+	addons.cpp addons.h \
 	addons/compactFlash.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp \
 	mic.cpp mic.h \
 	cheatSystem.cpp cheatSystem.h
diff --git a/src/cocoa/Info.plist b/src/cocoa/Info.plist
index b7ed86ca9..08e9ea6c6 100644
--- a/src/cocoa/Info.plist
+++ b/src/cocoa/Info.plist
@@ -32,11 +32,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8</string>
+	<string>0.9.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.8</string>
+	<string>0.9.1</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>