icculus.org git repositories - divverent/darkplaces.git/commit

]> icculus.org git repositories - divverent/darkplaces.git/commit

author	Wolfgang (Blub) Bumiller <blub@speed.at>
	Mon, 21 Dec 2009 17:25:04 +0000 (18:25 +0100)
committer	Wolfgang (Blub) Bumiller <blub@speed.at>
	Mon, 21 Dec 2009 17:25:04 +0000 (18:25 +0100)
commit	c8f606badaf560552d6066b15ab9b5897b0173d6
tree	2f6d304529a069ebe50cab346f4e07504216dd03	tree
parent	914c47c13ab9987843a53c848fd0a70da7744f0a	commit \| diff
parent	deb439e4d0f954489242e932c0fefee5cc2b3f77	commit \| diff

merging a most ridiculous conflict with the master branch...