From 857402219899effd1340dcc39010d09b9c5c24a7 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 22 Nov 2015 13:31:27 +0100
Subject: Prepare for release 2015.11.22

---
 ChangeLog    | 12 ++++++++++++
 src/config.h |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eb7a9d6..46dab63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
+Release 2015.11.22
+
+- Switch back to libcurl. tls_fingerprint setting has been replaced by
+  ca_bundle
+- Interruptible network transactions (press ^C). Timeouts removed
+- Config file parser fixes and improvements
+- Player respects proxy, replaced deprecated api calls
+- Added ability to change Pandora settings (username, password, explicit
+  content filter)
+- The usual minor bugfixes/improvements here and there
+
 Release 2014.09.28
+
 - Fix segfault when retrieving station’s feedback list
 - Refactored audio player
 - Correctly detect ffmpeg 2.3 and 2.4
diff --git a/src/config.h b/src/config.h
index db3b66e..e29c8ce 100644
--- a/src/config.h
+++ b/src/config.h
@@ -4,7 +4,7 @@
 /* package name */
 #define PACKAGE "pianobar"
 
-#define VERSION "2014.09.28-dev"
+#define VERSION "2015.11.22"
 
 /* glibc feature test macros, define _before_ including other files */
 #define _POSIX_C_SOURCE 200809L
-- 
cgit v1.2.3