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

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

commit 56368f28b9fa9ff2a953c2994fea0787052be5d1
Merge: b35a6d4 76a6a6c
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Thu Aug 13 17:02:19 2009 +0200

    Merge branch 'master' into harmattan

 data/dbus/tracker-resources-class.xml         |    1 +
 src/libtracker-data/tracker-sparql-query.vala |   52 +++++++---
 src/rasqal/rasqal.h                           |    2 +
 src/rasqal/rasqal.vapi                        |    3 +-
 src/rasqal/rasqal_expr.c                      |    7 +-
 src/rasqal/sparql_lexer.l                     |    1 +
 src/rasqal/sparql_parser.y                    |   24 ++++-
 src/tracker-miner-fs/tracker-main.c           |    2 +-
 src/tracker-store/tracker-events.c            |   91 +++++++++--------
 src/tracker-store/tracker-events.h            |    1 +
 src/tracker-store/tracker-marshal.list        |    1 +
 src/tracker-store/tracker-resource-class.c    |  135 +++++++++++++++++++++----
 src/tracker-store/tracker-resource-class.h    |    1 +
 src/tracker-store/tracker-resources.c         |   15 ++--
 14 files changed, 251 insertions(+), 85 deletions(-)
---

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