From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Thu, 16 Jun 2011 16:27:21 +0000 (+0100)
Subject: Bump git version after unplanned 0.10.35 release
X-Git-Tag: RELEASE-0.10.36~246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=239461f4a104ed55097fb92b1455c98bb843a0b8;p=platform%2Fupstream%2Fgstreamer.git

Bump git version after unplanned 0.10.35 release

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

239461f4a104ed55097fb92b1455c98bb843a0b8
diff --cc configure.ac
index d216f2e,f625f86..0a03ccd
--- 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, git and prerelease does Werror too
- AC_INIT(GStreamer, 0.10.34.1,
 -AC_INIT(GStreamer, 0.10.35,
++AC_INIT(GStreamer, 0.10.35.1,
      http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
      gstreamer)
  AG_GST_INIT
diff --cc docs/plugins/inspect/plugin-coreelements.xml
index aef69a7,50ea185..e99c780
--- a/docs/plugins/inspect/plugin-coreelements.xml
+++ b/docs/plugins/inspect/plugin-coreelements.xml
@@@ -3,10 -3,10 +3,10 @@@
    <description>standard GStreamer elements</description>
    <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
    <basename>libgstcoreelements.so</basename>
-   <version>0.10.34.1</version>
 -  <version>0.10.35</version>
++  <version>0.10.35.1</version>
    <license>LGPL</license>
    <source>gstreamer</source>
 -  <package>GStreamer source release</package>
 +  <package>GStreamer git</package>
    <origin>Unknown package origin</origin>
    <elements>
      <element>
@@@ -331,4 -331,4 +331,4 @@@
        </pads>
      </element>
    </elements>
--</plugin>
++</plugin>
diff --cc docs/plugins/inspect/plugin-coreindexers.xml
index e8d2401,b7741d0..80f072e
--- a/docs/plugins/inspect/plugin-coreindexers.xml
+++ b/docs/plugins/inspect/plugin-coreindexers.xml
@@@ -3,11 -3,11 +3,11 @@@
    <description>GStreamer core indexers</description>
    <filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename>
    <basename>libgstcoreindexers.so</basename>
-   <version>0.10.34.1</version>
 -  <version>0.10.35</version>
++  <version>0.10.35.1</version>
    <license>LGPL</license>
    <source>gstreamer</source>
 -  <package>GStreamer source release</package>
 +  <package>GStreamer git</package>
    <origin>Unknown package origin</origin>
    <elements>
    </elements>
--</plugin>
++</plugin>
diff --cc win32/common/config.h
index 74e6fc4,28185bb..af2c8e5
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@@ -65,7 -65,7 +65,7 @@@
  #define GST_PACKAGE_ORIGIN "Unknown package origin"
  
  /* GStreamer package release date/time for plugins as YYYY-MM-DD */
- #define GST_PACKAGE_RELEASE_DATETIME "2011-05-14T08:26Z"
 -#define GST_PACKAGE_RELEASE_DATETIME "2011-06-15"
++#define GST_PACKAGE_RELEASE_DATETIME "2011-06-18T12:45Z"
  
  /* location of the installed gst-plugin-scanner */
  #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner"
@@@ -340,7 -340,7 +340,7 @@@
  #define PACKAGE_NAME "GStreamer"
  
  /* Define to the full name and version of this package. */
- #define PACKAGE_STRING "GStreamer 0.10.34.1"
 -#define PACKAGE_STRING "GStreamer 0.10.35"
++#define PACKAGE_STRING "GStreamer 0.10.35.1"
  
  /* Define to the one symbol short name of this package. */
  #define PACKAGE_TARNAME "gstreamer"
@@@ -349,7 -349,7 +349,7 @@@
  #undef PACKAGE_URL
  
  /* Define to the version of this package. */
- #define PACKAGE_VERSION "0.10.34.1"
 -#define PACKAGE_VERSION "0.10.35"
++#define PACKAGE_VERSION "0.10.35.1"
  
  /* directory where plugins are located */
  #ifdef _DEBUG
@@@ -380,7 -380,7 +380,7 @@@
  #undef USE_POISONING
  
  /* Version number of package */
- #define VERSION "0.10.34.1"
 -#define VERSION "0.10.35"
++#define VERSION "0.10.35.1"
  
  /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
     significant byte first (like Motorola and SPARC, unlike Intel). */