about summary refs log tree commit diff homepage
path: root/README
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 /README
parentAssert client coords are valid after movement (diff)
downloadtorus-038957c275278559d6e3f814e9b06e9349e80738.tar.gz
torus-038957c275278559d6e3f814e9b06e9349e80738.zip
Add merge.c to README
Diffstat (limited to '')
-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.