From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/gstreamer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/gstreamer') diff --git a/package/gstreamer/Makefile b/package/gstreamer/Makefile index 6a3012635..2732faa5a 100644 --- a/package/gstreamer/Makefile +++ b/package/gstreamer/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 55d50f48a496799dbb0b195c9c6c6153 PKG_DESCR:= opensource multimedia framework -PKG_SECTION:= libs +PKG_SECTION:= libs/video PKG_URL:= http://gstreamer.freedesktop.org/ PKG_SITES:= http://gstreamer.freedesktop.org/src/gstreamer/ PKG_OPTS:= dev -- cgit v1.2.3