]> 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: c52a715 ffbcc8a)
Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/bot/bot.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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