[gnac/infobar: 22/22] Merge branch 'devel' into infobar

[David Joaquim <djoaquim src gnome org>]

commit dbd215d5927416896b7a0040289cad34b4b8eb84
Merge: bc2e248... 8d1ab86...
Author: David Joaquim <djoaquim src gnome org>
Date:   Tue Dec 8 20:19:02 2009 +0100

    Merge branch 'devel' into infobar

 .gitignore                  |    4 +
 configure.ac                |    2 +-
 data/profiles/base.xml.in   |    2 +-
 libgnac/libgnac-converter.c |   27 +++++---
 libgnac/libgnac-debug.c     |   51 +++++++++-----
 libgnac/libgnac-debug.h     |   39 ++++++++++-
 libgnac/libgnac-gst.c       |    4 +-
 man/gnac.1                  |   10 ++-
 po/POTFILES.in              |    1 +
 src/Makefile.am             |    2 +
 src/gnac-main.c             |   63 +++--------------
 src/gnac-main.h             |    3 +
 src/gnac-options.c          |  168 +++++++++++++++++++++++++++++++++++++++++++
 src/gnac-options.h          |   52 +++++++++++++
 14 files changed, 340 insertions(+), 88 deletions(-)
---