[tracker/harmattan: 1522/2240] Merge branch 'master' into harmattan

From: Martyn James Russell <mr src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [tracker/harmattan: 1522/2240] Merge branch 'master' into harmattan
Date: Thu, 4 Feb 2010 17:18:48 +0000 (UTC)

commit ba18de1784e433f6874f62d5d799b01f7a44d88f
Merge: aa5f4ac 0943aa9
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Thu Nov 12 17:00:44 2009 +0100

    Merge branch 'master' into harmattan

 NEWS                                            |   20 ++++
 configure.ac                                    |    2 +-
 data/ontologies/12-nrl.ontology                 |    2 +
 data/ontologies/32-nco.ontology                 |    3 +
 src/libtracker-common/libtracker-common.vapi    |    1 +
 src/libtracker-common/tracker-ontology.c        |   26 +++++
 src/libtracker-common/tracker-ontology.h        |    3 +
 src/libtracker-common/tracker-property.c        |   45 ++++++++-
 src/libtracker-common/tracker-property.h        |    5 +
 src/libtracker-data/libtracker-data.vapi        |    2 +-
 src/libtracker-data/tracker-data-manager.c      |  120 +++++++++++++++++-----
 src/libtracker-data/tracker-data-update.c       |   56 +++++++++--
 src/libtracker-data/tracker-data-update.h       |    2 +-
 src/libtracker-data/tracker-sparql-query.vala   |   70 +++++++++++---
 src/libtracker-data/tracker-sparql-scanner.vala |    2 +
 src/libtracker-fts/tracker-fts.c                |   15 ++-
 src/libtracker-miner/tracker-miner-fs.c         |   32 ++++---
 src/tracker-miner-fs/tracker-miner-files.c      |   14 ++-
 18 files changed, 340 insertions(+), 80 deletions(-)
---

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