[grilo/rpm: 19/20] Merge commit 'grilo-0.1.14' into rpm
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo/rpm: 19/20] Merge commit 'grilo-0.1.14' into rpm
- Date: Wed, 13 Apr 2011 17:35:33 +0000 (UTC)
commit 345f306290b7015c20f40e92f59ec5e96745c3fa
Merge: 5c4c148 dd4942b
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Wed Apr 13 16:04:23 2011 +0000
Merge commit 'grilo-0.1.14' into rpm
NEWS | 15 +
configure.ac | 2 +-
src/Makefile.am | 3 +-
src/grl-log-priv.h | 1 +
src/grl-log.c | 1 +
src/grl-marshal.list | 2 +-
src/grl-media-source.c | 563 +++++++++++++++++++++-------------------
src/grl-media-source.h | 40 ++--
src/grl-metadata-source-priv.h | 26 ++
src/grl-metadata-source.c | 329 +++++++++++++++++++++++-
src/grl-metadata-source.h | 35 ++-
src/grl-multiple.c | 13 +-
src/grl-plugin-registry.c | 236 +++++++++++++++--
src/grl-plugin-registry.h | 10 +-
tools/grilo-test-ui/main.c | 98 +++++---
15 files changed, 998 insertions(+), 376 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]