]> git.rm.cloudns.org Git - xonotic/netradiant.git/commit
Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 19:33:45 +0000 (21:33 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 19:33:45 +0000 (21:33 +0200)
commit839c9693774fdb0e420391f65b8066e8bd04c591
tree3385dd2d3544b202453f9d1310040b50bda0b245
parent84881a66140ad93d0b6cd4d55efbbb459bd91f48
parente7c45da823515747a88569374d62717b72dcf078
Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge
17 files changed:
Makefile
libs/string/string.h
radiant/build.cpp
radiant/build.h
radiant/csg.cpp
radiant/environment.cpp
radiant/environment.h
radiant/findtexturedialog.cpp
radiant/main.cpp
radiant/mainframe.cpp
radiant/map.cpp
radiant/server.cpp
tools/quake3/q3map2/brush.c
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/main.c
tools/quake3/q3map2/q3map2.h
tools/quake3/q3map2/shaders.c