]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/imagepng/plugin.cpp
Merge commit 'ddee6cbe7c5fcbba52e7881a411f310809b867f9' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:10:48 +0000 (06:10 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 04:10:48 +0000 (06:10 +0200)
commit7bfd2b428ff9b8e49c2291fa94163e293d364de6
tree8e572cac2cf3803fa729227bf2c064054cc17949
parentd2f81ac4b006b0147c9fba885d8e00b8d3cefb69
parentddee6cbe7c5fcbba52e7881a411f310809b867f9
Merge commit 'ddee6cbe7c5fcbba52e7881a411f310809b867f9' into master-merge
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/light_bounce.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/path_init.c
tools/quake3/q3map2/q3map2.h