de.git.xonotic.org Git - xonotic/xonotic.git/commit

]> de.git.xonotic.org Git - xonotic/xonotic.git/commit

author	Rudolf Polzer <rpolzer@grawp.(none)>
	Sat, 10 Apr 2010 16:05:46 +0000 (18:05 +0200)
committer	Rudolf Polzer <rpolzer@grawp.(none)>
	Sat, 10 Apr 2010 16:05:46 +0000 (18:05 +0200)
commit	f5bb6ca67804006b762fa17020fb040dac789a13
tree	5031317124fbab557d4dfde15fcabff5109b1968	tree \| snapshot
parent	2e2d41c6bae5b01774ffc793f650e762fe297561	commit \| diff

./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)