[tracker: 6/6] Merge branch 'nautilus-extension-update'

From: Martyn James Russell <mr src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker: 6/6] Merge branch 'nautilus-extension-update'
Date: Wed, 9 Feb 2011 10:54:00 +0000 (UTC)

commit 1fca084bd3e55ccd3712b43207cc1dec9f31ff39
Merge: 42c43a3 4b30c67
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Feb 9 10:53:36 2011 +0000

    Merge branch 'nautilus-extension-update'

 src/plugins/nautilus/Makefile.am              |    2 +-
 src/plugins/nautilus/tracker-tags-extension.c |   66 +--
 src/plugins/nautilus/tracker-tags-utils.c     |   94 ++--
 src/plugins/nautilus/tracker-tags-view.c      |  561 ++++++++++++++++---------
 4 files changed, 427 insertions(+), 296 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]