projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b69342f
)
uhm, shouldn't have done that this is righter
author
Thomas Vander Stichele
<thomas@apestaart.org>
Fri, 15 Mar 2002 22:17:20 +0000
(22:17 +0000)
committer
Thomas Vander Stichele
<thomas@apestaart.org>
Fri, 15 Mar 2002 22:17:20 +0000
(22:17 +0000)
Original commit message from CVS:
uhm, shouldn't have done that
this is righter
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
fa241ba
..
b26bb62
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,11
+2,7
@@
AC_INIT
AC_CANONICAL_TARGET([])
dnl when going to/from release please set the nano (fourth number) right !
-<<<<<<< configure.ac
-AS_VERSION(gstreamer, GST_VERSION, 0, 3, 2, )
-=======
AS_VERSION(gstreamer, GST_VERSION, 0, 3, 3, 1)
->>>>>>> 1.138
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AS_LIBTOOL(GST, 0, 0, 0, yes)