]> 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: 3e9e61e 8977c19)
Merge remote-tracking branch 'origin/master' into debugger/go
authorMario <zacjardine@y7mail.com>
Thu, 4 Dec 2014 23:37:44 +0000 (10:37 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 4 Dec 2014 23:37:44 +0000 (10:37 +1100)
Conflicts:
scripts/shaderlist.txt

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

diff --cc scripts/shaderlist.txt
index c702a722a084510c04825dc8044fb547ea33c90c,e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77..c0171dc0374c3149cfafc2e7cd5e05a76cfc8bc4
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -22,7 -24,7 +24,8 @@@ map_courtfu
  map_darkzone
  map_g-23
  map_glowplant
 +map_go
+ map_implosion
  map_leave_em_behind
  map_lightspeed
  map_newtonian-nightmare