[tracker/wip/sam/resource: 6/13] Merge branch 'wip/sam/extract-command' into wip/sam/resource
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/sam/resource: 6/13] Merge branch 'wip/sam/extract-command' into wip/sam/resource
- Date: Thu, 7 Apr 2016 17:35:34 +0000 (UTC)
commit 6cf59269bd1e3f2aaf025b5bc6a3f021c2d8aa39
Merge: 07bee8a 197a40b
Author: Sam Thursfield <sam afuera me uk>
Date: Thu Apr 7 16:43:40 2016 +0100
Merge branch 'wip/sam/extract-command' into wip/sam/resource
docs/manpages/tracker-extract.1 | 107 ++++++++++++++-----------
src/libtracker-common/tracker-log.c | 6 ++
src/tracker-extract/tracker-main.c | 16 ++--
src/tracker/Makefile.am | 3 +
src/tracker/bash-completion/tracker | 2 +-
src/tracker/tracker-extract.c | 152 +++++++++++++++++++++++++++++++++++
src/tracker/tracker-extract.h | 25 ++++++
src/tracker/tracker-main.c | 2 +
8 files changed, 256 insertions(+), 57 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]