[tracker/harmattan-pre-signal-updates: 887/1380] Merge branch 'master' into harmattan

From: Martyn James Russell <mr src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker/harmattan-pre-signal-updates: 887/1380] Merge branch 'master' into harmattan
Date: Wed, 22 Sep 2010 15:34:21 +0000 (UTC)

commit f12bb2f89841a7ad2e9afdddb6a456f19c76c8f2
Merge: c6fbed7 ad7a8b7
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Thu Aug 5 17:05:09 2010 +0200

    Merge branch 'master' into harmattan

 NEWS                                            |   34 +++++
 configure.ac                                    |    4 +-
 data/ontologies/89-mtp.ontology                 |    6 +-
 po/nds.po                                       |  114 +++++++++--------
 po/sl.po                                        |  159 +++++++++++------------
 src/libtracker-data/tracker-db-journal.c        |  113 ++++++++++++++++-
 src/libtracker-data/tracker-db-manager.c        |    5 +-
 src/tracker-extract/tracker-extract-gstreamer.c |    2 +
 src/tracker-extract/tracker-main.c              |   11 +-
 src/tracker-store/tracker-dbus.c                |   22 +++-
 src/tracker-store/tracker-dbus.h                |   13 +-
 src/tracker-store/tracker-main.c                |    2 +
 12 files changed, 328 insertions(+), 157 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]