de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/imagehl/sprite.cpp

]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/imagehl/sprite.cpp

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 839c969 cac5145)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 20:32:22 +0000 (22:32 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 20:32:22 +0000 (22:32 +0200)
commit	e984b9f54a0c733aab34a8ec19724dc4114ade28
tree	12e43208af1f3af251921dcd8242def647ed953a	tree \| snapshot
parent	839c9693774fdb0e420391f65b8066e8bd04c591	commit \| diff
parent	cac514541c3ae6f72c4c00c19c215ff62a023df4	commit \| diff

Merge commit 'cac514541c3ae6f72c4c00c19c215ff62a023df4' into garux-merge

libs/gtkutil/paned.cpp	diff1 \|	diff2 \|	blob \| history
libs/gtkutil/paned.h	diff1 \|	diff2 \|	blob \| history
radiant/brushmanip.cpp	diff1 \|	diff2 \|	blob \| history
radiant/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/gtkdlgs.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.h	diff1 \|	diff2 \|	blob \| history
radiant/patch.cpp	diff1 \|	diff2 \|	blob \| history
radiant/patchmanip.cpp	diff1 \|	diff2 \|	blob \| history