about summary refs log tree commit diff
path: root/git
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-11-07 16:25:23 +0100
committerLars Hjemli <hjemli@gmail.com>2010-11-07 16:25:23 +0100
commit69f705cf5727cc1f099f6cd6af759f66bfd9a343 (patch)
treeab36f62bc5fea3856603f6653f5c8da31233abea /git
parentMakefile: add -MP option (diff)
parentUse absolute path for scanned repo readme (diff)
downloadcgit-pink-69f705cf5727cc1f099f6cd6af759f66bfd9a343.tar.gz
cgit-pink-69f705cf5727cc1f099f6cd6af759f66bfd9a343.zip
Merge branch 'stable'
Conflicts:
	scan-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions
c7b70cfa8da069aceeddb0039b3e18827cf&follow=1'>Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 9a6c9c91c8092603b914cc0b3085d059e162ca29. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe