]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - setup/data/tools/bitmaps/window1.bmp
Merge commit '66d12fc2373b05233aa29ee097efe820f05a8520' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 11 Feb 2019 09:00:31 +0000 (10:00 +0100)
committerThomas Debesse <dev@illwieckz.net>
Mon, 11 Feb 2019 09:00:31 +0000 (10:00 +0100)
commite28939e7b819e0cb0c3050037ec0e57160f7dba1
tree4c8b9dd0c13692dc51714985f0023456a3dda97f
parentffb487e45c26dccd20285849979be1cb261c52f6
parent66d12fc2373b05233aa29ee097efe820f05a8520
Merge commit '66d12fc2373b05233aa29ee097efe820f05a8520' into garux-merge
tools/quake3/common/vfs.c
tools/quake3/common/vfs.h
tools/quake3/q3map2/main.c