]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge commit 'f3d0806dfea23aef768535ee2fc8e1fff9aebe9f' into master-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:29:33 +0000 (04:29 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:29:33 +0000 (04:29 +0200)
1  2 
radiant/gtkdlgs.cpp
radiant/mainframe.cpp
radiant/preferences.cpp
tools/quake3/q3map2/bsp.c
tools/quake3/q3map2/light.c
tools/quake3/q3map2/lightmaps_ydnar.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/q3map2.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge