diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-18 13:43:02 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-06-18 13:43:02 +0100 |
| commit | 822970901e2666e5a5d2533ecfceec625f25afe1 (patch) | |
| tree | 9a5ab351c6ab96ea5c72e703a30d73ce400e3337 /win32 | |
| parent | 53ee37b3d2f0dc8081bbc702207b87c0d719a3ea (diff) | |
| parent | 673d519898d18c513c3b5eeecd91f5d3091ddf79 (diff) | |
Bump git version after unplanned 0.10.30 release
Merge branch '0.10.30'
Conflicts:
configure.ac
docs/plugins/inspect/plugin-1394.xml
docs/plugins/inspect/plugin-aasink.xml
docs/plugins/inspect/plugin-alaw.xml
docs/plugins/inspect/plugin-alpha.xml
docs/plugins/inspect/plugin-alphacolor.xml
docs/plugins/inspect/plugin-annodex.xml
docs/plugins/inspect/plugin-apetag.xml
docs/plugins/inspect/plugin-audiofx.xml
docs/plugins/inspect/plugin-audioparsers.xml
docs/plugins/inspect/plugin-auparse.xml
docs/plugins/inspect/plugin-autodetect.xml
docs/plugins/inspect/plugin-avi.xml
docs/plugins/inspect/plugin-cacasink.xml
docs/plugins/inspect/plugin-cairo.xml
docs/plugins/inspect/plugin-cutter.xml
docs/plugins/inspect/plugin-debug.xml
docs/plugins/inspect/plugin-deinterlace.xml
docs/plugins/inspect/plugin-dv.xml
docs/plugins/inspect/plugin-efence.xml
docs/plugins/inspect/plugin-effectv.xml
docs/plugins/inspect/plugin-equalizer.xml
docs/plugins/inspect/plugin-esdsink.xml
docs/plugins/inspect/plugin-flac.xml
docs/plugins/inspect/plugin-flv.xml
docs/plugins/inspect/plugin-flxdec.xml
docs/plugins/inspect/plugin-gconfelements.xml
docs/plugins/inspect/plugin-gdkpixbuf.xml
docs/plugins/inspect/plugin-goom.xml
docs/plugins/inspect/plugin-goom2k1.xml
docs/plugins/inspect/plugin-gstrtpmanager.xml
docs/plugins/inspect/plugin-halelements.xml
docs/plugins/inspect/plugin-icydemux.xml
docs/plugins/inspect/plugin-id3demux.xml
docs/plugins/inspect/plugin-imagefreeze.xml
docs/plugins/inspect/plugin-interleave.xml
docs/plugins/inspect/plugin-isomp4.xml
docs/plugins/inspect/plugin-jack.xml
docs/plugins/inspect/plugin-jpeg.xml
docs/plugins/inspect/plugin-level.xml
docs/plugins/inspect/plugin-matroska.xml
docs/plugins/inspect/plugin-mulaw.xml
docs/plugins/inspect/plugin-multifile.xml
docs/plugins/inspect/plugin-multipart.xml
docs/plugins/inspect/plugin-navigationtest.xml
docs/plugins/inspect/plugin-oss4.xml
docs/plugins/inspect/plugin-ossaudio.xml
docs/plugins/inspect/plugin-png.xml
docs/plugins/inspect/plugin-pulseaudio.xml
docs/plugins/inspect/plugin-replaygain.xml
docs/plugins/inspect/plugin-rtp.xml
docs/plugins/inspect/plugin-rtsp.xml
docs/plugins/inspect/plugin-shapewipe.xml
docs/plugins/inspect/plugin-shout2send.xml
docs/plugins/inspect/plugin-smpte.xml
docs/plugins/inspect/plugin-soup.xml
docs/plugins/inspect/plugin-spectrum.xml
docs/plugins/inspect/plugin-speex.xml
docs/plugins/inspect/plugin-taglib.xml
docs/plugins/inspect/plugin-udp.xml
docs/plugins/inspect/plugin-video4linux2.xml
docs/plugins/inspect/plugin-videobox.xml
docs/plugins/inspect/plugin-videocrop.xml
docs/plugins/inspect/plugin-videofilter.xml
docs/plugins/inspect/plugin-videomixer.xml
docs/plugins/inspect/plugin-wavenc.xml
docs/plugins/inspect/plugin-wavpack.xml
docs/plugins/inspect/plugin-wavparse.xml
docs/plugins/inspect/plugin-ximagesrc.xml
docs/plugins/inspect/plugin-y4menc.xml
win32/common/config.h
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/common/config.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/common/config.h b/win32/common/config.h index 045610427a..c8c9ac4915 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -49,7 +49,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:44Z" +#define GST_PACKAGE_RELEASE_DATETIME "2011-05-18T13:36Z" /* struct v4l2_buffer missing */ #undef GST_V4L2_MISSING_BUFDECL @@ -396,7 +396,7 @@ #define PACKAGE_NAME "GStreamer Good Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Good Plug-ins 0.10.29.1" +#define PACKAGE_STRING "GStreamer Good Plug-ins 0.10.30.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-good" @@ -405,7 +405,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.29.1" +#define PACKAGE_VERSION "0.10.30.1" /* directory where plugins are located */ #ifdef _DEBUG @@ -436,7 +436,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.29.1" +#define VERSION "0.10.30.1" /* old wavpack API */ #undef WAVPACK_OLD_API |