diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-03 09:41:48 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-05-03 09:42:58 +0200 |
| commit | 5fe9bcd989cdfb4d540baab90cad32c5b4873752 (patch) | |
| tree | 794337828542c8eab37ce5048cb259743c105c2c /win32 | |
| parent | 2243adffa128c6f508b0926ee00bfb1b18fead5e (diff) | |
| parent | 11ac49e6c4d6a90b8ef55c66772d5a217de95d94 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
gst/gstbus.c
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/common/config.h | 8 | ||||
| -rw-r--r-- | win32/common/gstversion.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win32/common/config.h b/win32/common/config.h index 756fc529e..fad915699 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -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-04-16T12:48Z" +#define GST_PACKAGE_RELEASE_DATETIME "2011-04-30T14:22Z" /* location of the installed gst-plugin-scanner */ #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner" @@ -340,7 +340,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.10.32.2" +#define PACKAGE_STRING "GStreamer 0.10.32.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -349,7 +349,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.32.2" +#define PACKAGE_VERSION "0.10.32.4" /* directory where plugins are located */ #ifdef _DEBUG @@ -380,7 +380,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.32.2" +#define VERSION "0.10.32.4" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 558dceb2f..8b749c484 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -64,7 +64,7 @@ G_BEGIN_DECLS * The nano version of GStreamer at compile time: * Actual releases have 0, GIT versions have 1, prerelease versions have 2-... */ -#define GST_VERSION_NANO (2) +#define GST_VERSION_NANO (4) /** * GST_CHECK_VERSION: |