[gnac: 14/14] Merge branch 'devel'
- From: David Joaquim <djoaquim src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac: 14/14] Merge branch 'devel'
- Date: Thu, 20 May 2010 17:18:03 +0000 (UTC)
commit 71bc57e719e046dcc305e197a23c242390dd6532
Merge: a4158cb 7aa60bc
Author: David Joaquim <djoaquim src gnome org>
Date: Thu May 20 19:17:06 2010 +0200
Merge branch 'devel'
configure.ac | 11 +-
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 14 ++
debian/copyright | 40 +++++
debian/dirs | 1 +
debian/docs | 3 +
debian/rules | 105 +++++++++++++
libgnac/Makefile.am | 5 +
libgnac/libgnac-converter.c | 354 +++++++++++++++---------------------------
libgnac/libgnac-converter.h | 49 +-----
libgnac/libgnac-gst-utils.c | 2 +-
libgnac/libgnac-gst.c | 329 ++++++++++-----------------------------
libgnac/libgnac-gst.h | 61 +------
libgnac/libgnac-media-item.c | 84 +++++++---
libgnac/libgnac-metadata.c | 49 ++++---
libgnac/libgnac-output.c | 82 +++++------
libgnac/libgnac-output.h | 17 ++-
src/gnac-ui.c | 39 +++--
19 files changed, 569 insertions(+), 682 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]