diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-18 13:32:17 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-18 13:32:17 +0100 |
| commit | 74a756350f92b6d89ff59648c21a7cbc7e558b33 (patch) | |
| tree | 5cc5c7c75680457b4571bc28cac5b074b6c12dea /win32 | |
| parent | b2b1a7be1ba877f1f64fed7ff920855bb38becf1 (diff) | |
| parent | 04c392fa7d86f348ae9edaabf4c95b8deb64288e (diff) | |
Bump git version after unplanned 0.10.35 release
Merge branch '0.10.35'
Conflicts:
configure.ac
docs/plugins/inspect/plugin-adder.xml
docs/plugins/inspect/plugin-alsa.xml
docs/plugins/inspect/plugin-app.xml
docs/plugins/inspect/plugin-audioconvert.xml
docs/plugins/inspect/plugin-audiorate.xml
docs/plugins/inspect/plugin-audioresample.xml
docs/plugins/inspect/plugin-audiotestsrc.xml
docs/plugins/inspect/plugin-cdparanoia.xml
docs/plugins/inspect/plugin-decodebin.xml
docs/plugins/inspect/plugin-encoding.xml
docs/plugins/inspect/plugin-ffmpegcolorspace.xml
docs/plugins/inspect/plugin-gdp.xml
docs/plugins/inspect/plugin-gio.xml
docs/plugins/inspect/plugin-gnomevfs.xml
docs/plugins/inspect/plugin-libvisual.xml
docs/plugins/inspect/plugin-ogg.xml
docs/plugins/inspect/plugin-pango.xml
docs/plugins/inspect/plugin-playback.xml
docs/plugins/inspect/plugin-subparse.xml
docs/plugins/inspect/plugin-tcp.xml
docs/plugins/inspect/plugin-theora.xml
docs/plugins/inspect/plugin-typefindfunctions.xml
docs/plugins/inspect/plugin-uridecodebin.xml
docs/plugins/inspect/plugin-videorate.xml
docs/plugins/inspect/plugin-videoscale.xml
docs/plugins/inspect/plugin-videotestsrc.xml
docs/plugins/inspect/plugin-volume.xml
docs/plugins/inspect/plugin-vorbis.xml
docs/plugins/inspect/plugin-ximagesink.xml
docs/plugins/inspect/plugin-xvimagesink.xml
gst-libs/gst/audio/Makefile.am
gst/subparse/gstsubparse.c
win32/common/_stdint.h
win32/common/config.h
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/common/_stdint.h | 4 | ||||
| -rw-r--r-- | win32/common/config.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index 720e27881..f5905f1f9 100644 --- a/win32/common/_stdint.h +++ b/win32/common/_stdint.h @@ -1,8 +1,8 @@ #ifndef _GST_PLUGINS_BASE__STDINT_H #define _GST_PLUGINS_BASE__STDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "gst-plugins-base 0.10.34.1" -/* generated using gnu compiler gcc (Debian 4.5.2-8) 4.5.2 */ +#define _GENERATED_STDINT_H "gst-plugins-base 0.10.35.1" +/* generated using gnu compiler gcc (Debian 4.6.0-13) 4.6.1 20110611 (prerelease) */ #define _STDINT_HAVE_STDINT_H 1 #include <stdint.h> #endif diff --git a/win32/common/config.h b/win32/common/config.h index 547e907ab..9386b20a8 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -81,7 +81,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:32Z" +#define GST_PACKAGE_RELEASE_DATETIME "2011-05-18T13:30Z" /* I know the API is subject to change. */ #undef G_UDEV_API_IS_SUBJECT_TO_CHANGE @@ -337,7 +337,7 @@ #define PACKAGE_NAME "GStreamer Base Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.34.1" +#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.35.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" @@ -346,7 +346,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.34.1" +#define PACKAGE_VERSION "0.10.35.1" /* directory where plugins are located */ #ifdef _DEBUG @@ -377,7 +377,7 @@ #undef USE_TREMOLO /* Version number of package */ -#define VERSION "0.10.34.1" +#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). */ |