[grilo/rpm: 12/13] Merge commit 'grilo-0.1.17' into rpm
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo/rpm: 12/13] Merge commit 'grilo-0.1.17' into rpm
- Date: Wed, 7 Sep 2011 12:58:35 +0000 (UTC)
commit 9d363dfa9083a8a18248112f110caa9d6d1c02b7
Merge: b00e886 c78e287
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Wed Sep 7 07:43:57 2011 -0400
Merge commit 'grilo-0.1.17' into rpm
NEWS | 19 ++
configure.ac | 33 ++--
doc/Makefile.am | 2 +-
doc/grilo/Makefile.am | 2 +-
doc/grilo/grilo-docs.sgml | 17 ++
doc/grilo/grilo-sections.txt | 27 +++
doc/libs/Makefile.am | 105 ----------
doc/libs/grilo-libs-docs.sgml | 51 -----
doc/libs/grilo-libs-sections.txt | 28 ---
src/Makefile.am | 5 +-
src/data/grl-media-audio.c | 30 +++
src/data/grl-media-audio.h | 4 +
src/grilo.c | 27 ++-
src/grl-media-plugin.c | 3 -
src/grl-media-source.c | 14 +-
src/grl-metadata-key.c | 12 +
src/grl-metadata-key.h | 1 +
src/grl-metadata-source.c | 8 +-
src/grl-plugin-registry-priv.h | 32 +++
src/grl-plugin-registry.c | 415 +++++++++++++++++++++++---------------
src/grl-plugin-registry.h | 3 +-
tools/grilo-test-ui/main.c | 2 -
22 files changed, 443 insertions(+), 397 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]