de.git.xonotic.org Git - xonotic/netradiant.git/commit - tools/quake2/qdata_heretic2/common/qfiles.c

]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - tools/quake2/qdata_heretic2/common/qfiles.c

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 19c67e1 461d008)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 22 Feb 2021 23:49:09 +0000 (00:49 +0100)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 22 Feb 2021 23:49:09 +0000 (00:49 +0100)
commit	54a2bda443aace9c00a1615af10cc1dc8b1f0cd1
tree	f59b94c300201b16a4f4f9e9be10399264185486	tree \| snapshot
parent	19c67e1114f894604c3346fe1af9b015184328be	commit \| diff
parent	461d008daa6328113ea4ccda37e5604d3df14ba3	commit \| diff

Merge commit '461d008daa6328113ea4ccda37e5604d3df14ba3' into garux-merge

16 files changed:

libs/gtkutil/accelerator.cpp	diff1 \|	diff2 \|	blob \| history
libs/picomodel/pm_mdc.c	diff1 \|	diff2 \|	blob \| history
libs/stringio.h	diff1 \|	diff2 \|	blob \| history
plugins/md3model/md5.cpp	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/eclass_doom3.cpp	diff1 \|	diff2 \|	blob \| history
radiant/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/entity.h	diff1 \|	diff2 \|	blob \| history
radiant/entityinspector.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/preferences.cpp	diff1 \|	diff2 \|	blob \| history
radiant/preferences.h	diff1 \|	diff2 \|	blob \| history
radiant/texwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	diff1 \|	diff2 \|	blob \| history
tools/quake3/common/scriplib.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/portals.c	diff1 \|	diff2 \|	blob \| history