about summary refs log tree commit diff homepage
path: root/merge.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-11-29 12:20:49 -0500
committerJune McEnroe <june@causal.agency>2018-11-29 12:20:49 -0500
commit807c8008b405464cd35d975f741759c600b3cc6d (patch)
tree034ba80a1d9e278dc593cfb87c97b49d5e8a3346 /merge.c
parentFix make clean (diff)
downloadtorus-807c8008b405464cd35d975f741759c600b3cc6d.tar.gz
torus-807c8008b405464cd35d975f741759c600b3cc6d.zip
Call cap_enter in client and server
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions