From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 27 Aug 2010 07:44:58 +0000 (+0200)
Subject: ./all clean: also back out of merge conflicts
X-Git-Tag: xonotic-v0.1.0preview~260
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8fa0fcb4cb1e63a3f008ba9024c862716e79beb5;hp=8fa0fcb4cb1e63a3f008ba9024c862716e79beb5

./all clean: also back out of merge conflicts
---