Re: [Shotwell] shotwell and map widget
- From: Norbert Preining <preining logic at>
- To: shotwell-list gnome org
- Subject: Re: [Shotwell] shotwell and map widget
- Date: Wed, 23 Nov 2016 21:43:14 +0900
Hi Jens,
There's a plan, but there is still no clue which tile provider to use for
that.
Ok, that are good news.
What's the issue with rebasing it against master?
Well, lots of conflicts that are not trivial... the most persistent one
is in src/library/LibraryWIndow.vala, but there are big diffs in various
.ui files:
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/library/LibraryWindow.vala
both modified: ui/events_directory.ui
both modified: ui/import.ui
both modified: ui/media.ui
both modified: ui/offline.ui
both modified: ui/photo.ui
both modified: ui/trash.ui
I am using https://github.com/abrauchli/shotwell.git branch map-window.
All the best
Norbert
--
PREINING Norbert + TeX Live & Debian Developer + http://www.preining.info
GPG: 0x860CDC13 fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]