lp:~neon/ksnapshot/master

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

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
ksnapshot
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/ksnapshot.git.

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 2 minutes — see the log
Import started on izar and finished taking 2 minutes — see the log
Import started on alnitak and finished taking 2 minutes — see the log

Recent revisions

590. 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"

589. 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"

588. 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"

587. By Luigi Toscano

Remove empty MimeType entry from the desktop file

No need for it, and it leads to a lintian warning:
desktop-mime-but-no-exec-code
Even if ksnapshot is basically gone and it should probably
moved to unmaintained, this is trivial to fix.

BUG: 339988

586. By Boudhayan Gupta

Bump version to 2015.12

585. By Boudhayan Gupta

We don't care about KDELibs4 khotkeys

584. 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"

583. 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"

582. By Boudhayan Gupta

Move hotkey file from KHotkeys

581. By David Faure

set cmake_min_req to match kdelibs policy and enable newer cmake policies

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.