]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5065ee 4645e19)
Merge commit '4645e19ce9e8f8034233ac965a4103a13b75714c' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 11:27:17 +0000 (13:27 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 11:27:17 +0000 (13:27 +0200)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge