diff options
author | user <user@localhost.localdomain> | 2015-07-03 16:10:58 -0300 |
---|---|---|
committer | user <user@localhost.localdomain> | 2015-07-03 16:10:58 -0300 |
commit | b2e2ed153c6b8ea714753b716d46673557fa4ffe (patch) | |
tree | 29fd3ae6baab8ffdc6a14be7beefa1ebbf159ad1 | |
parent | added Thai baht (diff) | |
parent | Merge pull request #18 from the9ull/master (diff) | |
download | dotXCompose-b2e2ed153c6b8ea714753b716d46673557fa4ffe.tar.gz dotXCompose-b2e2ed153c6b8ea714753b716d46673557fa4ffe.tar.bz2 dotXCompose-b2e2ed153c6b8ea714753b716d46673557fa4ffe.zip |
Merge branch 'master' of github.com:kragen/xcompose
How odd that both Mark and I were adding Bitcoin stuff at the same place at the
same time :)
Conflicts:
dotXCompose
-rw-r--r-- | dotXCompose | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dotXCompose b/dotXCompose index 0403057..4134f76 100644 --- a/dotXCompose +++ b/dotXCompose @@ -1191,6 +1191,11 @@ include "%L" <Multi_key> <parenleft> <1> <1> <colon> <3> <0> <parenright> : "🕦" U1F566 # CLOCK FACE ELEVEN-THIRTY <Multi_key> <parenleft> <1> <2> <colon> <3> <0> <parenright> : "🕧" U1F567 # CLOCK FACE TWELVE-THIRTY -# Currencies. Or, at least, a currency. +# Bitcoin signs +<Multi_key> <bar> <B> : "฿" U0E3F # BITCOIN CURRENCY SIGN, ORIGINAL THAI CURRENCY SYMBOL BAHT +<Multi_key> <B> <bar> : "฿" U0E3F # BITCOIN CURRENCY SIGN, ORIGINAL THAI CURRENCY SYMBOL BAHT -<Multi_key> <bar> <b> : "฿" Thai_baht # THAI CURRENCY SYMBOL BAHT +<Multi_key> <minus> <B> : "Ƀ" U0243 # ALTERNATIVE BITCOIN CURRENCY SIGN, LATIN CAPITAL LETTER B WITH STROKE +<Multi_key> <B> <minus> : "Ƀ" U0243 # ALTERNATIVE BITCOIN CURRENCY SIGN, LATIN CAPITAL LETTER B WITH STROKE +<Multi_key> <minus> <b> : "ƀ" U0180 # ALTERNATIVE BIT CURRENCY SIGN, LATIN SMALL LETTER B WITH STROKE +<Multi_key> <b> <minus> : "ƀ" U0180 # ALTERNATIVE BIT CURRENCY SIGN, LATIN SMALL LETTER B WITH STROKE |