]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/imagepng/plugin.cpp
Merge commit '84881a66140ad93d0b6cd4d55efbbb459bd91f48' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:22:18 +0000 (04:22 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:22:18 +0000 (04:22 +0200)
commitfcb70e8e9cf76dd4993312a762e2ee255c1402a0
tree813e4fea61fa986e8c8ce0f458f7d698e7b9be84
parent8c4e2fcb9c77360f0918be91642777f91fc99e53
parent84881a66140ad93d0b6cd4d55efbbb459bd91f48
Merge commit '84881a66140ad93d0b6cd4d55efbbb459bd91f48' into master-merge
tools/quake3/common/scriplib.c
tools/quake3/common/vfs.c
tools/quake3/common/vfs.h
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/shaders.c