[tracker/harmattan-pre-signal-updates: 871/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: 871/1380] Merge branch 'master' into harmattan
Date: Wed, 22 Sep 2010 15:33:56 +0000 (UTC)

commit 2dbfb2d3266ae723ede5ddf147f9252ad2f87703
Merge: feb0007 a2de636
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Tue Aug 3 12:02:11 2010 +0200

    Merge branch 'master' into harmattan

 data/ontologies/33-nfo.ontology                  |   16 +++++-
 src/libtracker-fts/README.parsers                |    7 +++
 src/libtracker-fts/tracker-parser-libicu.c       |   60 ++++++++++++++++++++++
 src/libtracker-fts/tracker-parser-libunistring.c |   50 +++++++++++++-----
 src/libtracker-fts/tracker-parser-utils.h        |    8 +++
 src/tracker-extract/tracker-extract-playlist.c   |    2 +-
 tests/functional-tests/busy-handling-test.vala   |    4 +-
 tests/libtracker-fts/tracker-parser-test.c       |   11 +++-
 8 files changed, 136 insertions(+), 22 deletions(-)
---

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