Commit ab0b5e93 authored by Sabine's avatar Sabine
Browse files

Merge branch 'feat/linux/mcompile-DoConvert-read' of...

Merge branch 'feat/linux/mcompile-DoConvert-read' of https://github.com/keymanapp/keyman into feat/linux/mcompile-DoConvert-read

# Conflicts:
#	linux/mcompile/keymap/helpers.cpp
#	linux/mcompile/keymap/keymap.cpp
#	linux/mcompile/keymap/keymap.h
#	linux/mcompile/keymap/mc_import_rules.cpp
#	linux/mcompile/keymap/mcompile.cpp
parents 0a09e59a 6ff02e8b
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment