diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/gstreamer | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/gstreamer')
-rw-r--r-- | package/gstreamer/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |