]> 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: 8e040a2 44e2ba6)
Merge branch 'master' into divVerent/augenkrebs
authorRudolf Polzer <divverent@xonotic.org>
Fri, 9 Mar 2012 18:35:54 +0000 (19:35 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 9 Mar 2012 18:35:54 +0000 (19:35 +0100)
Conflicts:
scripts/shaderlist.txt

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

diff --cc scripts/shaderlist.txt
index 9cb8f5d99848460c1005922e57092b987be43d98,e925318423f2d67d134f52201d85438e31a6c64c..c6b5dbc80f9b3c984f6da99176b70e9dbcc25d71
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -55,4 -57,5 +57,6 @@@ trak4
  trak5x
  trak6x
  trak7x
 +map_augenkrebs
+ 
+