From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 27 Jul 2011 17:56:09 +0000 (+0200)
Subject: fix some merge conflicts in this cbp file, whatever that is. This may work, or may... 
X-Git-Tag: xonotic-v0.5.0~148^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0bc0a9c47261b77ba1dae24c2116f361c0f7cf71;p=xonotic%2Fxonotic-data.pk3dir.git

fix some merge conflicts in this cbp file, whatever that is. This may work, or may not.
---

diff --git a/qcsrc/qc-client.cbp b/qcsrc/qc-client.cbp
index 63e00e9e1..b8d82f574 100644
--- a/qcsrc/qc-client.cbp
+++ b/qcsrc/qc-client.cbp
@@ -11,11 +11,7 @@
 			<Build command="$make -src $makefile" />
 			<CompileFile command="$make -src $makefile" />
 			<Clean command="$make -src $makefile" />
-<<<<<<< HEAD
 			<DistClean command="$make -f $makefile distclean$target" />
-=======
-			<DistClean command="" />
->>>>>>> origin/master
 			<AskRebuildNeeded command="" />
 			<SilentBuild command="$make -src $makefile" />
 		</MakeCommands>
@@ -49,21 +45,12 @@
 					<Add option="-s" />
 				</Linker>
 				<MakeCommands>
-<<<<<<< HEAD
 					<Build command="$make -src $makefile" />
 					<CompileFile command="$make -src $makefile" />
 					<Clean command="$make -src $makefile" />
 					<DistClean command="" />
 					<AskRebuildNeeded command="" />
 					<SilentBuild command="$make -src $makefile" />
-=======
-					<Build command="$make -DRELEASE -src $makefile" />
-					<CompileFile command="$make -DRELEASE -src $makefile" />
-					<Clean command="$make -DRELEASE -src $makefile" />
-					<DistClean command="" />
-					<AskRebuildNeeded command="" />
-					<SilentBuild command="$make -DRELEASE -src $makefile" />
->>>>>>> origin/master
 				</MakeCommands>
 			</Target>
 		</Build>
@@ -108,13 +95,10 @@
 		<Unit filename="client\progs.src.REMOTE.src" />
 		<Unit filename="client\projectile.qc" />
 		<Unit filename="client\rubble.qc" />
-<<<<<<< HEAD
 		<Unit filename="client\scoreboard.qc" />
 		<Unit filename="client\scoreboard.qh" />
 		<Unit filename="client\shownames.qc" />
 		<Unit filename="client\shownames.qh" />
-=======
->>>>>>> origin/master
 		<Unit filename="client\sortlist.qc" />
 		<Unit filename="client\target_music.qc" />
 		<Unit filename="client\teamplay.qc" />