]> 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: 1900ebd 3f7cf41)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 25 Oct 2011 11:58:21 +0000 (13:58 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 25 Oct 2011 11:58:21 +0000 (13:58 +0200)
1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

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