]> 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: a7791fa 4faee34)
Merge remote branch 'origin/fruitiex/fbfix'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:21:25 +0000 (07:21 +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