lp:~neon/dragon/master

Created by Gaurav Chaturvedi on 2012-04-11 and last modified on 2018-01-16
Get this branch:
bzr branch lp:~neon/dragon/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
Dragon player
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/dragon.

The next import is scheduled to run in 1 hour.

Last successful import was 4 hours ago.

Import started 4 hours ago on russkaya and finished 4 hours ago taking 25 seconds — see the log
Import started 10 hours ago on pear and finished 10 hours ago taking 20 seconds — see the log
Import started 16 hours ago on pear and finished 16 hours ago taking 20 seconds — see the log
Import started 22 hours ago on russkaya and finished 22 hours ago taking 30 seconds — see the log
Import started on 2018-02-20 on pear and finished on 2018-02-20 taking 25 seconds — see the log
Import started on 2018-02-20 on pear and finished on 2018-02-20 taking 30 seconds — see the log
Import started on 2018-02-20 on pear and finished on 2018-02-20 taking 20 seconds — see the log
Import started on 2018-02-19 on russkaya and finished on 2018-02-19 taking 30 seconds — see the log
Import started on 2018-02-19 on russkaya and finished on 2018-02-19 taking 30 seconds — see the log
Import started on 2018-02-19 on pear and finished on 2018-02-19 taking 15 seconds — see the log

Recent revisions

726. By l10n daemon script <email address hidden> on 2018-01-16

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"

725. By l10n daemon script <email address hidden> on 2018-01-16

GIT_SILENT made messages (after extraction)

724. By l10n daemon script <email address hidden> on 2018-01-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"

723. By Albert Astals Cid on 2017-11-13

GIT_SILENT Upgrade KDE Applications version to 18.03.70.

722. By Harald Sitter on 2017-11-10

set proper desktop file name

Summary:
if the desktop file isn't org.kde.$binname we need to set it manually so
desktops know what we are (this is imperative on wayland for icons to work)

I get the distinct feeling we should just do away with the conflicting
naming -.-

BUG: 382910
FIXED-IN: 17.12

Reviewers: #kde_applications, ltoscano

Reviewed By: ltoscano

Subscribers: ltoscano

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

721. By l10n daemon script <email address hidden> on 2017-09-30

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"

720. By l10n daemon script <email address hidden> on 2017-09-30

GIT_SILENT made messages (after extraction)

719. By l10n daemon script <email address hidden> on 2017-09-11

GIT_SILENT made messages (after extraction)

718. By l10n daemon script <email address hidden> on 2017-07-30

GIT_SILENT made messages (after extraction)

717. By Albert Astals Cid on 2017-07-17

GIT_SILENT Upgrade KDE Applications version to 17.11.70.

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.