From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Wed, 2 Nov 2011 16:47:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/0.10.13'
X-Git-Tag: 1.19.3~499^2~895^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c290ab6de7f9ea844c685895ace117f5cdeb93f;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/0.10.13'
---

6c290ab6de7f9ea844c685895ace117f5cdeb93f
diff --cc configure.ac
index 6209498,9271c1d..64579bc
--- a/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,7 @@@ AC_PREREQ(2.60
  dnl initialize autoconf
  dnl when going to/from release please set the nano (fourth number) right !
  dnl releases only do Wall, cvs and prerelease does Werror too
- AC_INIT(GStreamer Libav, 0.10.12.1,
 -AC_INIT(GStreamer Libav, 0.10.13,
++AC_INIT(GStreamer Libav, 0.10.13.1,
      http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
      gst-ffmpeg)