git.xonotic.org Git - xonotic/darkplaces.git/commitdiff

]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff

projects / xonotic / darkplaces.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 854fba2 1b94bbb)

author	Akari <hetors.email@gmail.com>
	Fri, 15 Apr 2011 08:12:28 +0000 (11:12 +0300)
committer	Akari <hetors.email@gmail.com>
	Fri, 15 Apr 2011 08:12:28 +0000 (11:12 +0300)

		1	2
makefile.inc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge