]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9b4ab1 22f2c84)
Merge remote-tracking branch 'origin/terencehill/mine_explosion_fix'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:55:11 +0000 (20:55 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:55:11 +0000 (20:55 +0200)
1  2 
qcsrc/server/w_minelayer.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/w_minelayer.qc
Simple merge