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

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

commit 3fc5a1da5081386a9dbe0c9da459e00956e0a6c3
Merge: bb5bae7 8a66865
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Thu Aug 20 10:52:23 2009 +0200

    Merge branch 'master' into harmattan

 src/tracker-miner-fs/Makefile.am              |    4 +---
 src/tracker-store/Makefile.am                 |    4 +---
 src/tracker-store/tracker-removable-device.c  |    2 --
 tests/libtracker-data/tracker-ontology-test.c |    2 --
 tests/libtracker-data/tracker-sparql-test.c   |    2 --
 tests/tracker-miner-fs/Makefile.am            |    4 +---
 tests/tracker-store/Makefile.am               |    3 +--
 utils/services/data-validator.c               |    1 -
 8 files changed, 4 insertions(+), 18 deletions(-)
---

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