]> git.xonotic.org Git - xonotic/darkplaces.git/commit
projects / xonotic / darkplaces.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: fa69b5c 8b6a722)
Fix merge conflict caused by 8ae31a0c being copied from 8b3000dc with a slight change bones_was_here/sleep
authorbones_was_here <bones_was_here@xa.org.au>
Mon, 12 Apr 2021 09:21:26 +0000 (09:21 +0000)
committerbones_was_here <bones_was_here@xa.org.au>
Mon, 12 Apr 2021 09:21:26 +0000 (09:21 +0000)
commitfede41cba2098de845d51ba63ef20684c4f4e918
tree237f9221d63e01c82f8fd46f4bdf69871d7b6242tree | snapshot
parentfa69b5c5ef848690598cd528a572756fce840ba5commit | diff
parent8b6a72238c9e0686395f9849a9c00f8762f3a244commit | diff
Fix merge conflict caused by 8ae31a0c being copied from 8b3000dc with a slight change

# Conflicts:
#   host.c
host.c diff1 | diff2 | blob | history
sv_main.c diff1 | diff2 | blob | history