merge conflict
authorMirio <opivy@hotmail.de>
Tue, 7 Mar 2017 12:37:12 +0000 (13:37 +0100)
committerMirio <opivy@hotmail.de>
Tue, 7 Mar 2017 12:37:12 +0000 (13:37 +0100)
1  2 
scripts/shaderlist.txt

@@@ -23,8 -23,6 +23,7 @@@ map_boi
  map_catharsis
  map_courtfun
  map_darkzone
- map_g-23
 +map_erbium
  map_glowplant
  map_implosion
  map_leave_em_behind