Kopete

lp:~neon/kopete/master

Created by Philip Muškovac and last modified
Get this branch:
bzr branch lp:~neon/kopete/master

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
Kopete
Status:
Development

Import details

Import Status: Failed

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

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on alnitak and finished taking 15 seconds — see the log
Import started on alnitak and finished taking 15 seconds — see the log
Import started on izar and finished taking 20 seconds — see the log
Import started on alnitak and finished taking 20 seconds — see the log

Recent revisions

13421. By Luca Beltrame <email address hidden>

Merge branch 'Applications/18.04'

13420. By l10n daemon script <email address hidden>

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"

13419. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

13418. By l10n daemon script <email address hidden>

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"

13417. By Pino Toscano

Merge remote-tracking branch 'origin/Applications/18.04'

13416. By l10n daemon script <email address hidden>

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"

13415. By Pino Toscano

Merge remote-tracking branch 'origin/Applications/18.04'

13414. By l10n daemon script <email address hidden>

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"

13413. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

13412. By l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

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.