about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2017-09-27 15:25:58 -0400
committerJune McEnroe <june@causal.agency>2017-09-27 15:25:58 -0400
commit038957c275278559d6e3f814e9b06e9349e80738 (patch)
tree150b5d346654af5277db4fcae416cffd90e6919e
parentAssert client coords are valid after movement (diff)
downloadtorus-038957c275278559d6e3f814e9b06e9349e80738.tar.gz
torus-038957c275278559d6e3f814e9b06e9349e80738.zip
Add merge.c to README
-rw-r--r--README1
1 files changed, 1 insertions, 0 deletions
diff --git a/README b/README
index ae9e722..c4da87e 100644
--- a/README
+++ b/README
@@ -7,6 +7,7 @@ This software targets FreeBSD and Darwin.
     client.c       Curses client.
     help.c         Automated client which redraws a helpful banner.
     meta.c         Exports metadata from data file to CSV.
+    merge.c        Interactively merges two data files.
     snapshot.sh    Snapshots data file, appropriate for cron.
 
     sshd_config    Anonymous login to chrooted client.
ref='/catgirl/commit/ui.c?h=1.1&id=7d76246c3f488edf3770dc7b641965dbd60bf6e5&follow=1'>Highlight and beep pingsJune McEnroe 2018-08-07Factor out allocating conversion between wcs and mbsJune McEnroe 2018-08-07Match commands case-insensitivelyJune McEnroe 2018-08-07Convert input to multibyte before handlingJune McEnroe 2018-08-07Populate tab-complete listJune McEnroe 2018-08-07Fix /me formatting side-effectsJune McEnroe 2018-08-07Define ui.c BUF_LEN with enumJune McEnroe 2018-08-07Hack clang into checking uiFmt format stringsJune McEnroe 2018-08-07Handle PART and QUIT without messagesJune McEnroe 2018-08-07Make safe filling the who bufferJune McEnroe 2018-08-07Add reverse and reset IRC formatting codesJune McEnroe 2018-08-06Rewrite line editing again, add formattingJune McEnroe 2018-08-06Fix allocation size in vaswprintfJune McEnroe 2018-08-06Implement word wrappingJune McEnroe 2018-08-06Use wchar_t strings for all of UIJune McEnroe 2018-08-06Rename line editing functionsJune McEnroe 2018-08-05Initialize all possible color pairsJune McEnroe 2018-08-05Refactor color initializationJune McEnroe 2018-08-05Add ^L redrawJune McEnroe 2018-08-05Use 16 colors if availableJune McEnroe 2018-08-05Limit parsed colors to number of mIRC colorsJune McEnroe 2018-08-04Show source link on exitJune McEnroe 2018-08-04Implement line editing, scrollingJune McEnroe 2018-08-04Handle /topicJune McEnroe