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:
992e3f7
)
fix error caused by merging
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 15:54:42 +0000
(17:54 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 15:54:42 +0000
(17:54 +0200)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
47ca6ad
..
bc5e7fa
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-54,7
+54,6
@@
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
-<<<<<<< HEAD
GST_REQ=0.11.0
GSTPB_REQ=0.11.0