diff options
author | Christopher Olah <christopherolah.co@gmail.com> | 2011-01-22 02:41:13 -0500 |
---|---|---|
committer | Christopher Olah <christopherolah.co@gmail.com> | 2011-01-22 02:41:13 -0500 |
commit | bec9ce8d97342dd41ddf6e747431d1bbc5c07aea (patch) | |
tree | b034eb3f42d79e6a0eea7d2fe77e7ea3c8a4c1a9 /dotXCompose | |
parent | Fix namespace clash. (diff) | |
download | dotXCompose-bec9ce8d97342dd41ddf6e747431d1bbc5c07aea.tar.gz dotXCompose-bec9ce8d97342dd41ddf6e747431d1bbc5c07aea.tar.bz2 dotXCompose-bec9ce8d97342dd41ddf6e747431d1bbc5c07aea.zip |
Finally fixed the conflict, but cross product is still having problems.
Diffstat (limited to 'dotXCompose')
-rw-r--r-- | dotXCompose | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dotXCompose b/dotXCompose index c87d531..3b8525b 100644 --- a/dotXCompose +++ b/dotXCompose @@ -140,8 +140,8 @@ include "%L" <Multi_key> <backslash> <slash> : "∨" U2228 # LOGICAL OR <Multi_key> <backslash> <underscore> <slash> : "⊻" U22BB # XOR <Multi_key> <o> <asterisk> : "∘" U2218 # RING OPERATOR (function composition) -<Multi_key> <o> <asterisk> <x> : "×" UXD7 # TIMES X (cross product) -<Multi_key> <o> <asterisk> <period> : "⋅" U22C5 # DOT OPERATOR (dot product) +<Multi_key> <ampersand> <asterisk> <x> : "×" UXD7 # TIMES X (cross product) +<Multi_key> <ampersand> <asterisk> <period> : "⋅" U22C5 # DOT OPERATOR (dot product) <Multi_key> <0> <slash> : "∅" U2205 # EMPTY SET (thanks jsled!) <Multi_key> <slash> <0> : "∅" U2205 # EMPTY SET # I'm hoping { can work as a set mnemonic |