]> 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: 8b5fe18 f2d298b)
Merge branch 'master' into mand1nga/bot-debug
authormand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:36:26 +0000 (22:36 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:36:26 +0000 (22:36 -0300)
1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/autocvars.qh
Simple merge