Calligra

lp:~neon/calligra/master

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

Branch merges

Related bugs

Related blueprints

Branch information

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

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

Last successful import was .

Import started on pear and finished taking 2 minutes — see the log
Import started on russkaya and finished taking 2 minutes — see the log
Import started on neumayer and finished taking 3 minutes — see the log
Import started on neumayer and finished taking 3 minutes — see the log

Updating branch...

Launchpad is processing new changes to this branch which will be available in a few minutes. Reload to see the changes.

Recent revisions

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

75300. By l10n daemon script <email address hidden>

SVN_SILENT made messages (after extraction)

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

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

75297. By Cyrille Berger <email address hidden>

fix order of colors for floating point (it is worth to note that photoshop and gimp are not respecting the TIFF standard in that aspect)

BUG: 344334

75296. By Cyrille Berger <email address hidden>

fix crash when opening grayscale floating point

CCBUG:344334

75295. By Boudewijn

Merge branch 'calligra/2.9'

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

75293. By Boudewijn

Merge branch 'calligra/2.9'

Conflicts:
 libs/widgets/KoResourceTaggingManager.cpp

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

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.