From c68d72166d3aeacd2364b31c1f07d0aca29d4973 Mon Sep 17 00:00:00 2001
From: Grigori Goronzy <greg@chown.ath.cx>
Date: Thu, 23 Oct 2014 00:37:33 +0200
Subject: Update version and changelog

---
 Changelog          | 15 +++++++++++++++
 configure.ac       |  2 +-
 libass/Makefile.am |  4 ++--
 libass/ass.h       |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index bd6e0ba..f27680d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,18 @@
+libass (0.12.0)
+ * Implement fast quad-tree rasterizer in C and SSE2/AVX2 assembly
+ * Make \be animatable
+ * Add BorderStyle=4 (GH #105)
+ * Add selective style override functionality
+   * ass_set_selective_style_override()
+   * ass_set_selective_style_override_enabled()
+ * Support for assembly on DragonFly BSD
+ * Bugfixes
+   * Various parser fixes
+   * Fix premature parser exit on }{ in drawing mode (GH #75)
+   * Reset clipping mode on every rectangle clip
+   * Improved error handling for FriBidi and FreeType (GH #131)
+   * Fix bitmap combining cache
+
 libass (0.11.2)
  * Improve yasm version check
  * Fix \fscx0 crashes
diff --git a/configure.ac b/configure.ac
index 3d10ef9..0a216dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(libass, 0.11.2)
+AC_INIT(libass, 0.12.0)
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 # Disable C++/Fortran checks
diff --git a/libass/Makefile.am b/libass/Makefile.am
index bc5345b..599c281 100644
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -2,9 +2,9 @@ AM_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter \
             -Werror-implicit-function-declaration -Wstrict-prototypes        \
             -Wpointer-arith -Wredundant-decls
 
-LIBASS_LT_CURRENT = 5
+LIBASS_LT_CURRENT = 6
 LIBASS_LT_REVISION = 0
-LIBASS_LT_AGE = 0
+LIBASS_LT_AGE = 1
 
 yasm_verbose = $(yasm_verbose_$(V))
 yasm_verbose_ = $(yasm_verbose_$(AM_DEFAULT_VERBOSITY))
diff --git a/libass/ass.h b/libass/ass.h
index c8c6452..6b14e99 100644
--- a/libass/ass.h
+++ b/libass/ass.h
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include "ass_types.h"
 
-#define LIBASS_VERSION 0x01103001
+#define LIBASS_VERSION 0x01200000
 
 /*
  * A linked list of images produced by an ass renderer.
-- 
cgit v1.2.3