]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/archivezip/pkzip.h
Merge commit '7d7436ec3dd43cbdb04ad41f0a2c92a905f26807' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 11 Feb 2019 09:14:40 +0000 (10:14 +0100)
committerThomas Debesse <dev@illwieckz.net>
Mon, 11 Feb 2019 09:14:40 +0000 (10:14 +0100)
commitf32d0142f9d3c220966cd608ed0082133f331de5
treeedad325f36e38fe34fbe9c6c8e62445d9b5aae0c
parent19992696033a496e5c0925e950a29dc23de49b47
parent7d7436ec3dd43cbdb04ad41f0a2c92a905f26807
Merge commit '7d7436ec3dd43cbdb04ad41f0a2c92a905f26807' into garux-merge
tools/quake3/common/vfs.c
tools/quake3/common/vfs.h
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/q3map2.h