]> de.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: ea4c14f a4627da)
Merge remote-tracking branch 'origin/tzork/misc-fixes'
authorJakob MG <jakob_mg@hotmail.com>
Tue, 11 Oct 2011 08:41:15 +0000 (10:41 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 11 Oct 2011 08:41:15 +0000 (10:41 +0200)
1  2 
qcsrc/server/w_tuba.qc patch | diff1 | diff2 | blob | history

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