From: divVerent <divVerent@xonotic.org>
Date: Sat, 18 Sep 2010 08:05:00 +0000 (+0000)
Subject: (Commit created by redmine exporter script from page "Maps_Branches" version 6)
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=d90f59cadb82af730e88c735e8c8b2759255891a;p=xonotic%2Fxonotic.wiki.git

(Commit created by redmine exporter script from page "Maps_Branches" version 6)
---

diff --git a/Maps_Branches.textile b/Maps_Branches.textile
index 4fd69cd..c1a7296 100644
--- a/Maps_Branches.textile
+++ b/Maps_Branches.textile
@@ -14,7 +14,7 @@ LEAK, also, q3map2 light bugs
 
 h2. mintox/implosion
 
-Fine, but cannot be merged due to conflicts. Author has to merge from master into map branch and fix the conflicts. Also, too dark.
+DOES NOT MERGE. Author has to merge from master into map branch and fix the conflicts. Also, too dark.
 
 h2. fruitiex/aggressor
 
@@ -35,30 +35,71 @@ Waiting for final touches by Cuinnton.
 h2. plasmasheep/lsp
 h2. mintox/equinox
 h2. diabolik/ihsan
+
+DOES NOT MERGE.
+
 h2. ThePWTULN/campaigntimer
 h2. diabolik/strength
 h2. diabolik/darkzone
 h2. mookow/facility_114
 h2. mookow/facility114-ctf
+
+DOES NOT MERGE.
+
 h2. cbrutail/map-space_ctf
+
+DOES NOT MERGE.
+
 h2. cbrutail/textures-space_ctf
 h2. plasmasheep/valentine114
+
+DOES NOT MERGE.
+
 h2. savagex/courtfun
+
+DOES NOT MERGE. Superseded by divVerent/courtfun2?
+
 h2. savagex/techassault
 h2. mookow/condemned_castles
 h2. fruitiex/warfare
 h2. fruitiex/stormkeep
+
+DOES NOT MERGE.
+
 h2. fruitiex/space_elevator
+
+DOES NOT MERGE.
+
 h2. fruitiex/runningmanctf
 h2. fruitiex/flow
+
+DOES NOT MERGE.
+
 h2. fruitiex/final_rage
 h2. fruitiex/epsilon
+
+DOES NOT MERGE.
+
 h2. fruitiex/dance
+
+DOES NOT MERGE.
+
 h2. tzork/ents-onoff
 h2. tzork/glowarena
+
+DOES NOT MERGE. Superseded by divVerent/glowarena-cuinnton? If yes, DELETE.
+
 h2. fruitiex/cubemaps
 h2. fruitiex/textures
 h2. cbrutail/spacectf
+
+DOES NOT MERGE. Superseded by cbrutail/map-space_ctf? If yes, DELETE.
+
 h2. cbrutail/map-further
+
+DOES NOT MERGE.
+
 h2. cbrutail/sandbox-lighting
 h2. cbrutail/shaders_fx_xonotic2
+
+DOES NOT MERGE.