From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Sat, 10 Apr 2010 16:05:46 +0000 (+0200)
Subject: ./all - handle upstream rebase better (abort, instead of causing a frankenstein merge)
X-Git-Tag: xonotic-v0.1.0preview~504
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f5bb6ca67804006b762fa17020fb040dac789a13;hp=f5bb6ca67804006b762fa17020fb040dac789a13

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