Sabine b6a68c9f69 Merge branch 'refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION' of https://github.com/keymanapp/keyman into refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION ... # Conflicts: # common/test/keyboards/invalid/source/CERR_1234_sil_yoruba8_WrongCopyrightChar_and_WrongErrNrInName.kmn # common/test/keyboards/invalid/source/CERR_40133_balochi_phonetic_WrongErrNrInName.kmn # common/test/keyboards/invalid/source/sil_yoruba8_WrongCopyrightChar_AndMissingErNrInName.kmn # common/test/keyboards/invalid/source/xCERR_4034_balochi_phonetic_WrongNamingConvention.kmn chore(developer): solve conflicts		2022-10-13 18:05:28 +02:00
..
include	Merge branch 'refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION' into chore/merge-master-into-kmcompx	2022-09-20 11:06:55 +10:00
models	Merge pull request #7307 from keymanapp/dependabot/npm_and_yarn/nanoid-and-mocha--removed	2022-09-19 15:34:19 +10:00
predictive-text	Merge pull request #7307 from keymanapp/dependabot/npm_and_yarn/nanoid-and-mocha--removed	2022-09-19 15:34:19 +10:00
resources	chore(windows): address review comments	2022-06-16 04:47:53 +10:00
schemas	chore: Apply suggestions from code review	2022-07-15 08:58:12 +10:00
test	Merge branch 'refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION' of https://github.com/keymanapp/keyman into refactor/developer/6026-kmcompx-compiler-cross-platform-part-2-NEW_VERSION	2022-10-13 18:05:28 +02:00
web	Merge pull request #7307 from keymanapp/dependabot/npm_and_yarn/nanoid-and-mocha--removed	2022-09-19 15:34:19 +10:00
windows	chore(developer): change mostly whitespace changes	2022-10-04 14:08:59 +02:00