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

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

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 55a1d10 020d024)

author	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 02:21:38 +0000 (04:21 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 02:21:38 +0000 (04:21 +0200)
commit	8c4e2fcb9c77360f0918be91642777f91fc99e53
tree	e683adce493ca3549f185edd9de6ec2c361bf178	tree \| snapshot
parent	55a1d107979d5580c53ac4d8d6e4f738a2d3b3bd	commit \| diff
parent	020d0244e4239b21dc804d630edff926386ea34f	commit \| diff

Merge commit '020d0244e4239b21dc804d630edff926386ea34f' into master-merge

libs/gtkutil/cursor.cpp	diff1 \|	diff2 \|	blob \| history
libs/gtkutil/cursor.h	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/texwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/common/vfs.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/common/vfs.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/main.c	diff1 \|	diff2 \|	blob \| history