git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff

]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff

projects / xonotic / netradiant.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95f4573 d7bcc7c)

author	Mario <mario@smbclan.net>
	Sun, 16 Jul 2017 10:00:45 +0000 (20:00 +1000)
committer	Mario <mario@smbclan.net>
	Sun, 16 Jul 2017 10:00:45 +0000 (20:00 +1000)

		1	2
radiant/mainframe.cpp	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge