From a407632bab936a6348e16c688980884190af7307 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 24 Jun 2012 16:34:26 +0200
Subject: Prepare for release 2012.06.24

s/anonymous coward/joe johnson/ in commit
63c86dce1e248aa03a99792f56077dc176bcd295. Sorry, my bad :(
---
 ChangeLog    | 10 ++++++++++
 src/config.h |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2b0240a..c4165ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Release 2012.06.24
+
+- Removed setting audio_format, added audio_quality. libfaad (aac) is now required,
+  libmad (mp3) is optional (for Pandora One users)
+- Fix thumbs up/down
+- Fix race condition
+- Fix custom key bindings
+- Improve error messages
+- Minor bugfixes
+
 Release 2012.05.06
 
 - Move to JSON API (v5), see http://pan-do-ra-api.wikia.com/
diff --git a/src/config.h b/src/config.h
index bb6de05..e57d0e3 100644
--- a/src/config.h
+++ b/src/config.h
@@ -4,6 +4,6 @@
 /* package name */
 #define PACKAGE "pianobar"
 
-#define VERSION "2012.05.06-dev"
+#define VERSION "2012.06.24"
 
 #endif /* _CONFIG_H */
-- 
cgit v1.2.3