]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c87b26 208ff8c)
Merge remote-tracking branch 'origin/master' into debugger/aurora_ctf2 debugger/aurora_ctf2
authorMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 00:16:54 +0000 (11:16 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 00:16:54 +0000 (11:16 +1100)
Conflicts:
scripts/shaderlist.txt

1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --cc scripts/shaderlist.txt
index 3d8b13736460cfdc35bf5d2705e60eb96c471dc3,e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77..4cff15d02f11f1e1842f4eaadfa40c4f67b00eb2
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -18,7 -19,7 +19,8 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
 +map_aurora
+ map_catharsis
  map_courtfun
  map_darkzone
  map_g-23