lp:~neon/phonon/vlc

Created by Philip Muškovac on 2011-01-31 and last modified on 2019-07-19
Get this branch:
bzr branch lp:~neon/phonon/vlc

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
Phonon
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/phonon-vlc.

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 15 seconds — see the log
Import started 10 hours ago on alnitak and finished 10 hours ago taking 20 seconds — see the log
Import started 16 hours ago on izar and finished 16 hours ago taking 15 seconds — see the log
Import started 22 hours ago on alnitak and finished 22 hours ago taking 20 seconds — see the log
Import started on 2019-07-22 on alnitak and finished on 2019-07-22 taking 20 seconds — see the log
Import started on 2019-07-22 on izar and finished on 2019-07-22 taking 20 seconds — see the log
Import started on 2019-07-22 on izar and finished on 2019-07-22 taking 20 seconds — see the log
Import started on 2019-07-22 on alnitak and finished on 2019-07-22 taking 20 seconds — see the log
Import started on 2019-07-21 on izar and finished on 2019-07-21 taking 15 seconds — see the log
Import started on 2019-07-21 on izar and finished on 2019-07-21 taking 15 seconds — see the log

Recent revisions

653. By Harald Sitter on 2019-07-19

Merge branch '0.10'

# Conflicts:
# src/vlc.desktop.cmake

652. By l10n daemon script <email address hidden> on 2019-07-12

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"

651. By l10n daemon script <email address hidden> on 2019-07-08

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"

650. By Harald Sitter on 2019-07-05

Merge branch '0.10'

# Conflicts:
# src/vlc.desktop.cmake

649. By Luigi Toscano on 2019-07-03

Merge remote-tracking branch 'origin/0.10'

648. By Pino Toscano on 2019-06-30

Merge remote-tracking branch 'origin/0.10'

647. By l10n daemon script <email address hidden> on 2018-12-29

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"

646. By l10n daemon script <email address hidden> on 2018-12-29

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"

645. By Harald Sitter on 2018-12-10

Merge branch '0.10'

644. By Harald Sitter on 2018-10-09

Merge branch '0.10'

# Conflicts:
# src/vlc.desktop.cmake

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.