lp:~neon/marble/master

Created by Philip Muškovac on 2011-04-08 and last modified on 2019-10-15
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 1 hour.

Last successful import was 4 hours ago.

Import started 4 hours ago on alnitak and finished 4 hours ago taking 25 seconds — see the log
Import started 10 hours ago on izar and finished 10 hours ago taking 20 seconds — see the log
Import started 16 hours ago on alnitak and finished 16 hours ago taking 25 seconds — see the log
Import started 22 hours ago on izar and finished 22 hours ago taking 25 seconds — see the log
Import started on 2019-10-16 on alnitak and finished on 2019-10-16 taking 30 seconds — see the log
Import started on 2019-10-16 on izar and finished on 2019-10-16 taking 20 seconds — see the log
Import started on 2019-10-15 on alnitak and finished on 2019-10-15 taking 25 seconds — see the log
Import started on 2019-10-15 on izar and finished on 2019-10-15 taking 25 seconds — see the log
Import started on 2019-10-15 on alnitak and finished on 2019-10-15 taking 25 seconds — see the log
Import started on 2019-10-15 on izar and finished on 2019-10-15 taking 20 seconds — see the log

Recent revisions

12163. By Jens-Michael Hoffmann <email address hidden> on 2019-10-15

Proof deleted.

12162. By Jens-Michael Hoffmann <email address hidden> on 2019-10-15

Proof of existance for KDE sysadmins.

12161. By Torsten Rahn <email address hidden> on 2019-09-12

- Consider MARBLE_DATA_PATH and MARBLE_PLUGIN_PATH on Windows as well.

12160. By Torsten Rahn <email address hidden> on 2019-09-12

Remove superfluous extra lineWidth Q_PROPERTY.

12159. By l10n daemon script <email address hidden> on 2019-09-07

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"

12158. By Torsten Rahn <email address hidden> on 2019-09-03

- Exporting the MarbleDeclarativePlugin.
- Adding QML GeoItem and QML GeoPolyline.

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

12157. By John Zaitseff on 2019-09-02

Initialise default styles just once; display an icon for points.
Previously, default styles would be constructed for every placemark.
Now create the default styles just once, then copy as required.

In addition, now display an icon for placemarks with points, but not for
lines or polygons.
Currently, the icon cannot be styled with the Simplestyle properties
"marker-size", "marker-symbol" or "marker-color":
this is yet to be implemented.

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

12156. By John Zaitseff on 2019-09-02

Add the svgs/solid/dot-circle.svg icon from FontAwesome

FontAwesome icons are licensed under CC BY 4.0 and are
available from https://github.com/FortAwesome/Font-Awesome.git

The svgs/solid/dot-circle.svg from repository tag 5.10.2
(commit 090e6148d3f63a45b40e7cd8679bd4d64e58d75d) was used for this commit.

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

12155. By John Zaitseff on 2019-09-02

Add a test for the GeoJSON file parser.

12154. By John Zaitseff on 2019-09-02

Minor code cleanup of GeoJSON plugin, adding the new author and date

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

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.