[tracker/harmattan: 1528/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 1528/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:19:03 +0000 (UTC)
commit 2a6928aac8c22256d05f2d337503f6b1ad9b38b4
Merge: df4e21b 13316e7
Author: Jürg Billeter <j bitron ch>
Date: Thu Nov 12 19:25:32 2009 +0100
Merge branch 'master' into harmattan
data/ontologies/34-nmo.ontology | 4 ++
python/rss_reader/main.py | 39 +++++++++++++++++++-----
python/rss_reader/signaler.py | 30 +++++++++++++++---
python/rss_reader/tracker_backend.py | 20 +++++++++++-
src/tracker-search-tool/tracker-search-tool.gs | 18 +++++++++++
5 files changed, 96 insertions(+), 15 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]