lp:~aroth/kdev-python/trunk
- Get this branch:
- bzr branch lp:~aroth/kdev-python/trunk
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kdev-python.
Last successful import was .
Recent revisions
- 1816. 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" - 1812. By Kevin Funk
-
Attempt to fix Windows build
Error:
CMake Error: Could not open file for write in copy operation /kdevphpversion.h.tmp - 1811. 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" - 1810. 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" - 1809. 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)