commit ebe6f872ad5381812db3043e656dfc7379e9fa22
Merge: 7d7c0b6 dcc8032
Author: Christophe Fergeau <cferg...@mandriva.com>
Date:   Tue Feb 9 23:48:49 2010 +0100

    Merge branch 'udev'
    
    Conflicts:
        tools/Makefile.am

 configure.ac                               |   25 ++
 tools/Makefile.am                          |   75 +++--
 tools/backends.h                           |   68 ++++
 tools/{hal-callout.c => generic-callout.c} |  361 ++++------------------
 tools/hal-backend.c                        |  459 ++++++++++++++++++++++++++++
 tools/iphone-callout.c                     |    8 +-
 tools/libgpod.rules.in                     |    5 +
 tools/udev-backend.c                       |  275 +++++++++++++++++
 8 files changed, 952 insertions(+), 324 deletions(-)
---

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to