lp:~neon/calligra/master
- Get this branch:
- bzr branch lp:~neon/calligra/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/calligra.git.
Last successful import was .
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" - 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
- 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/KoResourceTaggi ngManager. 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)