projects / platform / upstream / gst-plugins-good.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b121bb0 865140f)
Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 13:49:41 +0000 (15:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 29 Apr 2011 13:49:41 +0000 (15:49 +0200)
Conflicts:
configure.ac
gst/rtp/gstrtpgstpay.c

1  2 
configure.ac patch | diff1 | diff2 | blob | history
ext/jpeg/gstjpegdec.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
index bc5e7fa,0f50db5..47ca6ad
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -54,8 -54,8 +54,9 @@@ AC_LIBTOOL_WIN32_DL
  AM_PROG_LIBTOOL
  
  dnl *** required versions of GStreamer stuff ***
 -GST_REQ=0.10.32.2
 -GSTPB_REQ=0.10.32.2
++<<<<<<< HEAD
 +GST_REQ=0.11.0
 +GSTPB_REQ=0.11.0
  
  dnl *** autotools stuff ****
  
diff --cc ext/jpeg/gstjpegdec.c
Simple merge
Domain: Multimedia / Media Common;