]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd07917 da1e17b)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Dec 2010 08:03:27 +0000 (09:03 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Dec 2010 08:03:27 +0000 (09:03 +0100)
1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

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