ktouch

lp:~neon/ktouch/master

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

Branch merges

Related bugs

Related blueprints

Branch information

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

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 15 seconds — see the log
Import started on pear and finished taking 20 seconds — see the log
Import started on pear and finished taking 25 seconds — see the log
Import started on pear and finished taking 25 seconds — see the log

Recent revisions

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

1108. By Sebastian Gottfried <email address hidden>

Merge remote-tracking branch 'origin/Applications/16.12'

# Conflicts:
# CMakeLists.txt

1107. By Sebastian Gottfried <email address hidden>

Add Japanese Keyboard Layout

Contributed by Osamu Aoki <email address hidden>. Many thanks!

FEATURE: 373526
FIXED-IN: 17.4.0

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

1105. By Burkhard Lück

fix typo, thanks for spotting

BUG:373367

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

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

1102. By Sebastian Gottfried <email address hidden>

Merge Branch 'Applications/16.12'

1101. By Sebastian Gottfried <email address hidden>

WIP latvian (reverted from commit 9e3434c007821bfd2cab0623e82df765fe9c06d0)

1100. By Sebastian Gottfried <email address hidden>

WIP latvian

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.