lp:~neon/marble/master

Created by Philip Muškovac on 2011-04-08 and last modified on 2019-08-12
Get this branch:
bzr branch lp:~neon/marble/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
marble
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/marble.

The next import is scheduled to run as soon as possible.

Last successful import was 7 hours ago.

Import started 7 hours ago on alnitak and finished 7 hours ago taking 20 seconds — see the log
Import started 13 hours ago on alnitak and finished 13 hours ago taking 25 seconds — see the log
Import started 19 hours ago on alnitak and finished 19 hours ago taking 25 seconds — see the log
Import started on 2019-08-18 on alnitak and finished on 2019-08-18 taking 25 seconds — see the log
Import started on 2019-08-18 on alnitak and finished on 2019-08-18 taking 20 seconds — see the log
Import started on 2019-08-17 on alnitak and finished on 2019-08-17 taking 20 seconds — see the log
Import started on 2019-08-17 on alnitak and finished on 2019-08-17 taking 20 seconds — see the log
Import started on 2019-08-17 on alnitak and finished on 2019-08-17 taking 25 seconds — see the log
Import started on 2019-08-17 on alnitak and finished on 2019-08-17 taking 25 seconds — see the log
Import started on 2019-08-16 on alnitak and finished on 2019-08-16 taking 25 seconds — see the log

Recent revisions

12147. By l10n daemon script <email address hidden> on 2019-08-12

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

12146. By l10n daemon script <email address hidden> on 2019-08-12

GIT_SILENT made messages (after extraction)

12145. By Martin Koller <email address hidden> on 2019-07-22

fix failing DMS-String parsing on windows

Differential Revision: https://phabricator.kde.org/D19330

12144. By Pino Toscano on 2019-07-05

i18n: fix extraction of legend strings with double quotes

Make sure to escape them, otherwise the double quotes conflicts with
the fake C++ QCoreApplication::translate() calls used to extract the
strings.

12143. By Jonathan Riddell on 2019-05-23

update screenshot

12142. By l10n daemon script <email address hidden> on 2019-05-22

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

12141. By l10n daemon script <email address hidden> on 2019-05-21

GIT_SILENT made messages (after extraction)

12140. By Laurent Montel <email address hidden> on 2019-05-13

It's time to use cmake 3.5

12139. By Bernhard Beschow <email address hidden> on 2019-05-01

Simplify normalized linear interpolation between two GeoDataCoordinates

12138. By Bernhard Beschow <email address hidden> on 2019-05-01

Introduce GeoDataCoordinates::rotateAround() overload

Avoids duplicate code.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.