]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/imagehl/sprite.cpp
Merge commit '804c20949d43175179489ecbb1305752cfa17217' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 15:26:39 +0000 (17:26 +0200)
committerThomas Debesse <dev@illwieckz.net>
Tue, 26 May 2020 15:26:39 +0000 (17:26 +0200)
commit6134b25a1b87ad94c5a082915064a33ea66b07d7
treef404a40eb9a5d8b661b6efa4fe744151bee609c2
parent1644eeece07040927ced5628e3922774576c64c9
parent804c20949d43175179489ecbb1305752cfa17217
Merge commit '804c20949d43175179489ecbb1305752cfa17217' into garux-merge
radiant/build.cpp
radiant/mainframe.cpp
radiant/map.cpp
tools/quake3/q3map2/main.c