commit e234a5ea0355c9d368cd9cb0ff7a4976c73e244c
Merge: 2f3d393 7ea70a3
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Fri Dec 9 12:59:07 2011 +0000
Merge commit 'grilo-0.1.18' into debian
.gitignore | 1 +
AUTHORS | 1 +
NEWS | 17 +++++++
bindings/vala/grilo-0.1-custom.vala | 60 ++++++++++++------------
bindings/vala/grilo-0.1.metadata | 5 ++
configure.ac | 24 ++++++---
libs/net/Makefile.am | 15 +-----
libs/net/grl-net-wc.c | 24 ++++++++-
libs/net/wc-test.c | 90 -----------------------------------
src/Makefile.am | 3 +
src/grilo.c | 35 +++++++++++--
src/grl-media-source.c | 4 +-
src/grl-metadata-source.c | 2 +-
src/grl-multiple.c | 2 +-
src/grl-plugin-registry.c | 4 +-
src/grl-util.h | 2 +-
tools/grilo-inspect/Makefile.am | 1 -
tools/grilo-test-ui/Makefile.am | 1 -
18 files changed, 133 insertions(+), 158 deletions(-)
---