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

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

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 73d4458 ce0ea4b)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:29:25 +0000 (04:29 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:29:25 +0000 (04:29 +0200)
commit	82224c4441e6ce60c89b0fbd15c3c1f4edab4a40
tree	245d41ca69cf3f5e77ba5b19ac25aae7bb286702	tree \| snapshot
parent	73d44588f5a08518740d5cda1040dd755a1c360e	commit \| diff
parent	ce0ea4bdc1521a3926994077fc104e7a155d299d	commit \| diff

Merge commit 'ce0ea4bdc1521a3926994077fc104e7a155d299d' into master-merge

plugins/shaders/shaders.cpp	diff1 \|	diff2 \|	blob \| history
radiant/gtkdlgs.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mru.cpp	diff1 \|	diff2 \|	blob \| history
radiant/preferences.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/game_quake3.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/map.c	diff1 \|	diff2 \|	blob \| history