]> 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: 41fcd5f 4a8318d)
Merge remote branch 'origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Mar 2011 11:48:02 +0000 (12:48 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Mar 2011 11:48:02 +0000 (12:48 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

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