[tracker/binary-log: 7/7] Merge branch 'master' into binary-log
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/binary-log: 7/7] Merge branch 'master' into binary-log
- Date: Fri, 8 Jan 2010 11:27:38 +0000 (UTC)
commit fdd7f0af358eba2b7c17f4f459e55ded2ca3f248
Merge: a1776aa d467f28
Author: Jürg Billeter <j bitron ch>
Date: Thu Jan 7 16:31:56 2010 +0100
Merge branch 'master' into binary-log
NEWS | 36 +++++++++++++++++++++++++
configure.ac | 2 +-
src/libtracker-data/tracker-sparql-query.vala | 10 +++++++
src/libtracker-fts/tracker-fts.c | 28 +------------------
src/tracker-extract/tracker-msword.cpp | 4 ---
src/tracker-extract/tracker-msword.h | 10 ++++---
6 files changed, 54 insertions(+), 36 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]