3540035ace
Conflicts: m17n-db-1.6.5-bn-itrans-bug182227.patch m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch m17n-db-1.6.5-number_pad_itrans-222634.patch m17n-db-1.7.0-fix-e-o-mappings.patch
27 lines
636 B
Diff
27 lines
636 B
Diff
<<<<<<< HEAD
|
||
--- a/MIM/kn-inscript.mim.orig 2013-05-23 18:22:04.000000000 +0530
|
||
+++ b/MIM/kn-inscript.mim 2014-01-27 14:55:52.000000000 +0530
|
||
=======
|
||
--- MIM/kn-inscript.mim.orig 2013-05-23 18:22:04.000000000 +0530
|
||
+++ MIM/kn-inscript.mim 2014-01-27 14:55:52.000000000 +0530
|
||
>>>>>>> 8f23436ee09b0d9785069f97b08faa52279bf983
|
||
@@ -59,6 +59,9 @@
|
||
\"ಜ್ಞ\" : ಜ + ್ + ಞ
|
||
p + d + } [OR] %
|
||
|
||
+9) ZWNJ is assigned to key 'V'
|
||
+ ZWJ is assigned to key '\\\\'
|
||
+
|
||
Key summary: Shankar Prasad <svenkate@redhat.com>
|
||
|
||
")
|
||
@@ -161,7 +164,7 @@
|
||
("X" "")
|
||
("C" ?ಣ)
|
||
("c" ?ಮ)
|
||
-;; V
|
||
+ ("V" "")
|
||
("v" ?ನ)
|
||
;; B
|
||
("b" ?ವ)
|