]> 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: 801fd81 fc189c1)
Merge remote branch 'origin/master' into mirceakitsune/weapon_hagar_secondary_load
authorSamual <samual@xonotic.org>
Thu, 21 Apr 2011 02:17:54 +0000 (22:17 -0400)
committerSamual <samual@xonotic.org>
Thu, 21 Apr 2011 02:17:54 +0000 (22:17 -0400)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

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