]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/shaders/shaders.cpp
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)
commit84756b932f65be549f04bea386964701337d94ff
tree388858513baae9b1630ba9c4938bd46c76e230e4
parent82224c4441e6ce60c89b0fbd15c3c1f4edab4a40
parentf3d0806dfea23aef768535ee2fc8e1fff9aebe9f
Merge commit 'f3d0806dfea23aef768535ee2fc8e1fff9aebe9f' into master-merge
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