[tracker/harmattan: 20/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 20/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:11:34 +0000 (UTC)
commit a91c1f250bc0dc2af36cf48340f75919cfe77a54
Merge: 6968c6f 62247c2
Author: Jürg Billeter <j bitron ch>
Date: Mon May 4 18:52:27 2009 +0200
Merge branch 'master' into harmattan
autogen.sh | 8 +++
configure.ac | 58 +++++++++---------
src/libtracker-data/tracker-data-update.c | 4 +
src/libtracker-db/tracker-db-dbus.c | 12 +++-
src/tracker-applet/tracker-applet.c | 2 +-
src/tracker-extract/tracker-extract-xmp.c | 81 +++++++++++++++++++------
src/tracker-search-tool/tracker-search-tool.c | 2 +-
src/tracker-search-tool/tracker-search-tool.h | 10 ++--
8 files changed, 118 insertions(+), 59 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]