From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 May 2012 15:25:00 +0000 (+0200)
Subject: rename conflict watch to xoncw :P
X-Git-Tag: xonotic-v0.7.0~55^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=26e02eb7d0cc8be0f72fbf282c5f06c223ecdd33;p=xonotic%2Fxonotic.git

rename conflict watch to xoncw :P
---

diff --git a/misc/tools/conflict-rss.sh b/misc/tools/conflict-rss.sh
index 682b78ee..d20d44e0 100755
--- a/misc/tools/conflict-rss.sh
+++ b/misc/tools/conflict-rss.sh
@@ -47,7 +47,7 @@ to_rss()
 	<link>http://git.xonotic.org/</link>
 	<description>Xonotic Conflict Watch for branches by $name</description>
 	<ttl>3600</ttl>
-	<atom:link href="http://de.git.xonotic.org/conflicts/$filename" rel="self" type="application/rss+xml" />
+	<atom:link href="http://nl.git.xonotic.org/xoncw/$filename" rel="self" type="application/rss+xml" />
 	<lastBuildDate>$datetime</lastBuildDate>
 EOF
 	fi
@@ -55,7 +55,7 @@ EOF
 	<item>
 		<title>$branch$repotxt</title>
 		<link>http://git.xonotic.org/?p=$repo;a=shortlog;h=refs/heads/$branch</link>
-		<guid isPermaLink="false">http://de.git.xonotic.org/conflicts/$filename#$hash</guid>
+		<guid isPermaLink="false">http://nl.git.xonotic.org/xoncw/$filename#$hash</guid>
 		<description><![CDATA[
 		Conflicts of $branch at $hash against $masterbranch at $masterhash:
 EOF