summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-10-23 23:05:59 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-10-23 23:05:59 +0000
commitb9e012c606be58f7968a867fd3d96f72fbb8da39 (patch)
treee47215799541f614a4bff246f263a4a985955e99
parent2b3f876d7cbcc791dc7807edeb42034f91126036 (diff)
back to HEAD
Original commit message from CVS: back to HEAD
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--docs/upload.mak1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 00492d6d..3945233a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-24 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ * docs/upload.mak:
+ back to HEAD
+
=== release 0.9.4 ===
2005-10-24 Thomas Vander Stichele <thomas at apestaart dot org>
diff --git a/configure.ac b/configure.ac
index 3dfdd430..13f434b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_MAINTAINER_MODE
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins-good, GST_PLUGINS_GOOD_VERSION, 0, 9, 4, 0,
+AS_VERSION(gst-plugins-good, GST_PLUGINS_GOOD_VERSION, 0, 9, 4, 1,
GST_CVS="no", GST_CVS="yes")
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
diff --git a/docs/upload.mak b/docs/upload.mak
index ed01e5e9..90a86d7a 100644
--- a/docs/upload.mak
+++ b/docs/upload.mak
@@ -16,6 +16,7 @@
DOC_SERVER=freedesktop.org
DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc
DOC_URL=$(DOC_SERVER):$(DOC_BASE)
+GST_VERSION_NANO = $(GST_PLUGINS_GOOD_VERSION_NANO)
upload: $(FORMATS)