git.xonotic.org Git - xonotic/netradiant.git/commit

]> git.xonotic.org Git - xonotic/netradiant.git/commit

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 84881a6 e7c45da)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 19:33:45 +0000 (21:33 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 19:33:45 +0000 (21:33 +0200)
commit	839c9693774fdb0e420391f65b8066e8bd04c591
tree	3385dd2d3544b202453f9d1310040b50bda0b245	tree \| snapshot
parent	84881a66140ad93d0b6cd4d55efbbb459bd91f48	commit \| diff
parent	e7c45da823515747a88569374d62717b72dcf078	commit \| diff

Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge

17 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
libs/string/string.h	diff1 \|	diff2 \|	blob \| history
radiant/build.cpp	diff1 \|	diff2 \|	blob \| history
radiant/build.h	diff1 \|	diff2 \|	blob \| history
radiant/csg.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.h	diff1 \|	diff2 \|	blob \| history
radiant/findtexturedialog.cpp	diff1 \|	diff2 \|	blob \| history
radiant/main.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/map.cpp	diff1 \|	diff2 \|	blob \| history
radiant/server.cpp	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/brush.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/bspfile_abstract.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/main.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/q3map2.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/shaders.c	diff1 \|	diff2 \|	blob \| history