[tracker: 3/3] Merge branch 'subsecond'
- From: JÃrg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker: 3/3] Merge branch 'subsecond'
- Date: Wed, 16 Nov 2011 17:35:39 +0000 (UTC)
commit 1f93d2a4a2a87c3f7c6294ced1072d136ba51772
Merge: 665ac21 fefdaa1
Author: JÃrg Billeter <j bitron ch>
Date: Wed Nov 16 17:34:58 2011 +0000
Merge branch 'subsecond'
src/libtracker-common/Makefile.am | 3 +-
src/libtracker-common/libtracker-common.vapi | 2 +-
src/libtracker-common/tracker-date-time.c | 60 +++++++++++++------
src/libtracker-common/tracker-date-time.h | 8 +-
src/libtracker-data/Makefile.am | 3 +-
src/libtracker-data/tracker-data-update.c | 14 +++-
src/libtracker-data/tracker-sparql-expression.vala | 2 +-
src/libtracker-data/tracker-sparql-query.vala | 4 +-
src/libtracker-extract/tracker-utils.c | 40 +-------------
tests/functional-tests/01-insertion.py | 4 +-
tests/libtracker-data/subqueries/subqueries-1.out | 4 +-
.../subqueries/subqueries-union-2.out | 10 ++--
tests/libtracker-extract/tracker-test-utils.c | 5 +-
13 files changed, 77 insertions(+), 82 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]