lp:~neon/kompare/master

Created by Philip Muškovac on 2013-02-11 and last modified on 2021-01-14
Get this branch:
bzr branch lp:~neon/kompare/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
kompare
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/sdk/kompare.

The next import is scheduled to run in 3 hours.

Last successful import was 2 hours ago.

Import started 2 hours ago on alnitak and finished 2 hours ago taking 10 seconds — see the log
Import started 8 hours ago on alnitak and finished 8 hours ago taking 10 seconds — see the log
Import started 14 hours ago on izar and finished 14 hours ago taking 10 seconds — see the log
Import started 20 hours ago on alnitak and finished 20 hours ago taking 10 seconds — see the log
Import started on 2021-01-19 on izar and finished on 2021-01-19 taking 10 seconds — see the log
Import started on 2021-01-19 on alnitak and finished on 2021-01-19 taking 10 seconds — see the log
Import started on 2021-01-19 on izar and finished on 2021-01-19 taking 10 seconds — see the log
Import started on 2021-01-18 on alnitak and finished on 2021-01-18 taking 10 seconds — see the log
Import started on 2021-01-18 on izar and finished on 2021-01-18 taking 10 seconds — see the log
Import started on 2021-01-18 on izar and finished on 2021-01-18 taking 10 seconds — see the log

Recent revisions

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

1036. By l10n daemon script <email address hidden> on 2021-01-05

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"

1035. By l10n daemon script <email address hidden> on 2021-01-04

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"

1034. By Christoph Feck <email address hidden> on 2021-01-02

GIT_SILENT Update Appstream for new release

(cherry picked from commit e11f15519bd29a623c924f39da192fbeb070e963)

1033. By Yuri Chornoivan <email address hidden> on 2020-12-28

Add the diff homepage address to the docs

BUG:430908

1032. By Friedrich W. H. Kossebau <email address hidden> on 2020-12-05

App: use commits.kde.org/kompare as homepage

NO_CHANGELOG

1031. By Friedrich W. H. Kossebau <email address hidden> on 2020-12-05

Port to new KPluginMetaData-based KParts API

NO_CHANGELOG

1030. By Christoph Feck <email address hidden> on 2020-12-02

GIT_SILENT Update Appstream for new release

(cherry picked from commit 9854ab4c3c837265542f055541898eb689533f53)

1029. By Friedrich W. H. Kossebau <email address hidden> on 2020-11-14

Convert license statements to SPDX expressions

Also add/move license files as required by REUSE specification

1028. By Friedrich W. H. Kossebau <email address hidden> on 2020-11-13

Merge branch 'release/20.12'

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.