about summary refs log tree commit diff homepage
path: root/README
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2017-09-27 15:25:58 -0400
committerJune McEnroe <programble@gmail.com>2017-09-27 15:25:58 -0400
commit484c8a39e1cec59144babfcc0466c69557e5030b (patch)
tree935a3b913df270a86f913d5d1279702a497d6a3f /README
parentAssert client coords are valid after movement (diff)
downloadtorus-484c8a39e1cec59144babfcc0466c69557e5030b.tar.gz
torus-484c8a39e1cec59144babfcc0466c69557e5030b.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.
cgit-pink/commit/cgitrc.5.txt?h=1.4.1&id=86b753cbc076855f06a7d44490b2ba9f2b07d879&follow=1'>cgitrc.5.txt: document 'embedded' and 'noheader'Lars Hjemli 2009-07-25Add support for 'noheader' optionLars Hjemli 2009-07-25cgitrc.5.txt: document 'head-include'Lars Hjemli 2009-07-25ui-blob: return 'application/octet-stream' for binary blobsLars Hjemli 2009-07-25ui-plain: Return 'application/octet-stream' for binary files.Remko Tronçon 2009-06-11use cgit_httpscheme() for atom feedDiego Ongaro 2009-06-11add cgit_httpscheme() -> http:// or https://Diego Ongaro 2009-06-07Return http statuscode 404 on unknown branchLars Hjemli 2009-06-07Add head-include configuration option.Mark Lodato 2009-03-15CGIT 0.8.2.1Lars Hjemli 2009-03-15Fix doc-related glitches in Makefile and .gitignoreLars Hjemli 2009-03-15ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli 2009-03-15fix segfault when displaying empty blobsEric Wong 2009-02-19Add support for HEAD requestsLars Hjemli 2009-02-19Add support for ETag in 'plain' viewLars Hjemli 2009-02-12ui-tree: escape ascii-text properly in hexdump viewLars Hjemli 2009-02-12Makefile: add doc-related targetsLars Hjemli