diff options
author | Mark Shoulson <mark@kli.org> | 2011-12-09 07:33:13 -0800 |
---|---|---|
committer | Mark Shoulson <mark@kli.org> | 2011-12-09 07:33:13 -0800 |
commit | 4e065274cc35fab67e56cd8b705aceb25b642efe (patch) | |
tree | 000676cae0bbba535d9870000f9c3f98a9cbe95b /install | |
parent | Merge pull request #5 from rory/master (diff) | |
parent | Fix a clash between • and ꙭ (diff) | |
download | dotXCompose-4e065274cc35fab67e56cd8b705aceb25b642efe.tar.gz dotXCompose-4e065274cc35fab67e56cd8b705aceb25b642efe.tar.bz2 dotXCompose-4e065274cc35fab67e56cd8b705aceb25b642efe.zip |
Merge pull request #7 from gwolf/master
Some chat aids - And one conflict fixed (introduced by myself)
Diffstat (limited to 'install')
0 files changed, 0 insertions, 0 deletions