lp:~neon/marble/master

Created by Philip Muškovac on 2011-04-08 and last modified on 2019-03-31
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 in 4 hours.

Last successful import was 1 hour ago.

Import started 1 hour ago on izar and finished 1 hour ago taking 20 seconds — see the log
Import started 7 hours ago on alnitak and finished 7 hours ago taking 25 seconds — see the log
Import started 13 hours ago on izar and finished 13 hours ago taking 20 seconds — see the log
Import started 19 hours ago on izar and finished 19 hours ago taking 20 seconds — see the log
Import started on 2019-04-24 on alnitak and finished on 2019-04-24 taking 25 seconds — see the log
Import started on 2019-04-24 on izar and finished on 2019-04-24 taking 20 seconds — see the log
Import started on 2019-04-24 on izar and finished on 2019-04-24 taking 20 seconds — see the log
Import started on 2019-04-24 on alnitak and finished on 2019-04-24 taking 20 seconds — see the log
Import started on 2019-04-23 on alnitak and finished on 2019-04-23 taking 20 seconds — see the log
Import started on 2019-04-23 on alnitak and finished on 2019-04-23 taking 25 seconds — see the log

Recent revisions

12133. By l10n daemon script <email address hidden> on 2019-03-31

GIT_SILENT made messages (after extraction)

12132. By l10n daemon script <email address hidden> on 2019-03-23

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"

12131. By l10n daemon script <email address hidden> on 2019-03-14

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"

12130. By Andreas Sturmlechner <email address hidden> on 2019-03-04

Try to fix build with MARBLE_NO_WEBKITWIDGETS

Summary: It is used in sources previously included above the definition.

Test Plan: Builds fine with and without Qt5WebEngineWidgets

Reviewers: #marble, rahn

Reviewed By: #marble, rahn

Subscribers: marble-devel, kde-edu

Tags: #marble, #kde_edu

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

12129. By Andreas Sturmlechner <email address hidden> on 2019-03-04

Avoid overwriting Qt5_FOUND with Qt5DBus or Qt5WebEngine disabled

Summary: Fixes at least a big cmake warning and potentially ppc64 build.

Test Plan: Builds fine with and without Qt5WebEngine.

Reviewers: #marble, rahn

Reviewed By: #marble, rahn

Subscribers: rahn, marble-devel, kde-edu

Tags: #marble, #kde_edu

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

12128. By Volker Krause <email address hidden> on 2019-02-28

Fix Android build on binary factory

12127. By Jonathan Marten <email address hidden> on 2019-02-27

Eliminate message "QFileSystemEngine::fillMetaData: Empty filename passed to function"

Seen when scrolling or zooming to a part of the map which has not been
visited before and which is not cached.

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

12126. By l10n daemon script <email address hidden> on 2019-02-24

GIT_SILENT made messages (after extraction)

12125. By Volker Krause <email address hidden> on 2019-02-22

Fix Android build without WebEngine

Summary: Should hopefully fix the build on binary factory.

Reviewers: apol

Reviewed By: apol

Subscribers: marble-devel, kde-edu

Tags: #marble, #kde_edu

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

12124. By l10n daemon script <email address hidden> on 2019-02-11

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"

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.