<feed xmlns='http://www.w3.org/2005/Atom'>
<title>src/filters/html-converters/man2html, branch master</title>
<subtitle>dontfiles
</subtitle>
<id>https://git.causal.agency/src/atom?h=master</id>
<link rel='self' href='https://git.causal.agency/src/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://git.causal.agency/src/'/>
</feed>
c?h=master' type='application/atom+xml'/>
<link rel='vcs-git' href='https://git.causal.agency/torus' title='torus Git repository'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='main'><a href='/'>index</a> : <a href='/torus/'>torus</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='2dda5826731ce18d0d24ae3d13de1c80008227e6'/><select name='h' onchange='this.form.submit();'>
<option value='92187f2a12bcc9b108773e080074b4cfc47f6db9'>this commit</option>
<optgroup label='branches'><option value='ansi'>ansi</option>
<option value='backport'>backport</option>
<option value='cgi'>cgi</option>
<option value='daemon'>daemon</option>
<option value='master' selected='selected'>master</option>
<option value='v1'>v1</option>
<option value='v2'>v2</option>
</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>collaborative ASCII art
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/torus/about/'>about</a> <a href='/torus/'>summary</a> <a href='/torus/refs/?id=2dda5826731ce18d0d24ae3d13de1c80008227e6'>refs</a> <a class='active' href='/torus/log/merge.c?follow=1'>log</a> <a href='/torus/tree/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6'>tree</a> <a href='/torus/commit/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6&amp;follow=1'>commit</a> <a href='/torus/diff/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6&amp;follow=1'>diff</a> <a href='https://ascii.town'>homepage</a></td><td class='form'><form class='right' method='get' action='/torus/log/merge.c'>
<input type='hidden' name='id' value='2dda5826731ce18d0d24ae3d13de1c80008227e6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/torus/log/?id=2dda5826731ce18d0d24ae3d13de1c80008227e6&amp;follow=1'>root</a>/<a href='/torus/log/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6&amp;follow=1'>merge.c</a> (<a href='/torus/log/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/torus/log/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-03-05 12:39:40 -0500'>2018-03-05</span></td><td><a href='/torus/commit/merge.c?id=2dda5826731ce18d0d24ae3d13de1c80008227e6&amp;follow=1'>Undef COLOR_ constants in torus.h</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-03-05 12:37:52 -0500'>2018-03-05</span></td><td><a href='/torus/commit/Makefile?id=69dbc210391ff7829e2ceeb05770d1de517a329b&amp;follow=1'>Generate tags</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-10-03 12:32:05 -0400'>2017-10-03</span></td><td><a href='/torus/commit/Makefile?id=f595106dee331dd864ebb15bab9ae17675967168&amp;follow=1'>Simplify Makefile with pattern rule</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-27 15:28:16 -0400'>2017-09-27</span></td><td><a href='/torus/commit/torus.h?id=46abcc7b70cfa8da069aceeddb0039b3e18827cf&amp;follow=1'>Remove leading blank lines</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-27 15:25:58 -0400'>2017-09-27</span></td><td><a href='/torus/commit/README?id=038957c275278559d6e3f814e9b06e9349e80738&amp;follow=1'>Add merge.c to README</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-03 15:34:21 -0400'>2017-09-03</span></td><td><a href='/torus/commit/server.c?id=0c5568b6a60d67bbbf84fd037d41826ccc497b8e&amp;follow=1'>Assert client coords are valid after movement</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-03 14:57:17 -0400'>2017-09-03</span></td><td><a href='/torus/commit/torus.h?id=58eb1831071734bafbdd6c6d846fb493b17a4961&amp;follow=1'>Relicense AGPL</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-01 13:55:48 -0400'>2017-09-01</span></td><td><a href='/torus/commit/torus.h?id=9915cb618fd8552372756ce3d1877d6e8564d021&amp;follow=1'>Revert "Add client readOnly mode"</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-01 12:33:54 -0400'>2017-09-01</span></td><td><a href='/torus/commit/server.c?id=2f5f73d10a13f612f54ae1e5be8519d72a9372a0&amp;follow=1'>Remove clientRemove call from clientCast</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-09-01 00:08:07 -0400'>2017-09-01</span></td><td><a href='/torus/commit/torus.h?id=9a6c9c91c8092603b914cc0b3085d059e162ca29&amp;follow=1'>Add client readOnly mode</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-31 15:37:36 -0400'>2017-08-31</span></td><td><a href='/torus/commit/merge.c?id=2aa5fe545bdba997bdb728a2dfb2e3bca93766ae&amp;follow=1'>Clean up merge tool</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-31 13:45:12 -0400'>2017-08-31</span></td><td><a href='/torus/commit/merge.c?id=22198d6399a006f59d162b2e00a7b8205c8f6e9b&amp;follow=1'>Choose B for tiles with equal modify times</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-31 01:00:02 -0400'>2017-08-31</span></td><td><a href='/torus/commit/merge.c?id=2188bd834c546b40d4b19258f8729ecae86be853&amp;follow=1'>Add quick data file merge tool</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-30 11:16:22 -0400'>2017-08-30</span></td><td><a href='/torus/commit/client.c?id=38d460d2bae7569ec0c2d99086fd2fd5e8a8897c&amp;follow=1'>Use only foreground color for selecting spawn</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-29 18:33:59 -0400'>2017-08-29</span></td><td><a href='/torus/commit/torus.h?id=af645c09089d1ed8e99c760f05234ac3df402901&amp;follow=1'>Add four additional spawns</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-28 23:38:40 -0400'>2017-08-28</span></td><td><a href='/torus/commit/torus.h?id=ce13621292bdfeafd7c6561c432a1d96deccbd3a&amp;follow=1'>Add respawning</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-26 23:46:14 -0400'>2017-08-26</span></td><td><a href='/torus/commit/torus.h?id=ccdad79970a150eec64758e1a3b14b084d4cb42f&amp;follow=1'>Move license above includes</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-26 19:32:55 -0400'>2017-08-26</span></td><td><a href='/torus/commit/snapshot.sh?id=e5184500830e04f3c9839d2dac62108fcb28133f&amp;follow=1'>Snapshot metadata</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-26 16:51:14 -0400'>2017-08-26</span></td><td><a href='/torus/commit/README?id=7cfc2d9b309c4c664a177e55441f88a64e15561c&amp;follow=1'>Add meta.c to README</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2017-08-26 16:47:57 -0400'>2017-08-26</span></td><td><a href='/torus/commit/server.c?id=592d0fbdc59c19c89bf4fd5498591d07b0d9c132&amp;follow=1'>Use Makefile</a></td><td>June McEnroe