[vlc-commits] On the road to 1.1.12

[Jean-Baptiste Kempf]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug  1 13:07:34 2011 +0200| [32bbddc2e9a5bc8b093280b275c7da6464a30fcb] | committer: Jean-Baptiste Kempf

On the road to 1.1.12

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=32bbddc2e9a5bc8b093280b275c7da6464a30fcb
---

 NEWS         |   15 +++++++++++++++
 configure.ac |    6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index deb492f..a0f4821 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Changes between 1.1.10 and 1.1.12-git:
+----------------------------------
+
+Audio outputs:
+ * Mac OS X: Auhal, multiple fixes for Digital Audio output
+ * PulseAudio: multiple fixes and improvements, notably for sync
+
+Unix port:
+ * Fix build compatibility with taglib < 1.6 and Xulrunner 1.9.1
+
+Misc:
+ * Fix crashes with Japanese locale on OS X
+ * Minor fixes for Webplugin under Win32 and AudioScrobller
+
+
 Changes between 1.1.10 and 1.1.11:
 ----------------------------------
 
diff --git a/configure.ac b/configure.ac
index ddabd96..3664d5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
 
-AC_INIT(vlc, 1.1.11)
+AC_INIT(vlc, 1.1.12-git)
 VERSION_MAJOR="1"
 VERSION_MINOR="1"
-VERSION_REVISION="11"
-VERSION_EXTRA=""
+VERSION_REVISION="12"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)