[tracker/subqueries: 17/17] Merge branch 'master' into subqueries

From: Jürg Billeter <juergbi src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [tracker/subqueries: 17/17] Merge branch 'master' into subqueries
Date: Tue, 8 Dec 2009 09:13:01 +0000 (UTC)

commit 189e94dcdbce4ae6e605faf2c66d29f1f588e2fb
Merge: fd985d8... 251ba95...
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Tue Dec 8 10:12:19 2009 +0100

    Merge branch 'master' into subqueries

 NEWS                                               |   64 ++
 configure.ac                                       |    9 +-
 data/ontologies/38-nmm.ontology                    |    3 +-
 data/ontologies/91-maemo.ontology                  |    5 +
 .../libtracker-miner/tmpl/tracker-miner-fs.sgml    |  168 -----
 .../tmpl/tracker-miner-manager.sgml                |  176 -----
 .../libtracker-miner/tmpl/tracker-miner.sgml       |  217 ------
 po/et.po                                           |   12 +-
 src/libtracker-common/tracker-utils.h              |    4 +
 src/libtracker-miner/tracker-miner-fs.c            |    3 +-
 src/libtracker-miner/tracker-monitor.c             |    3 +-
 src/tracker-extract/Makefile.am                    |    1 +
 src/tracker-extract/tracker-extract-msoffice.c     |  712 +++++++++++++++++---
 src/tracker-search-bar/tracker-results-window.c    |    3 +
 14 files changed, 722 insertions(+), 658 deletions(-)
---

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