]> 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: 683672f 69fb3ad)
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Mon, 2 May 2011 13:08:57 +0000 (16:08 +0300)
committerFruitieX <fruitiex@gmail.com>
Mon, 2 May 2011 13:08:57 +0000 (16:08 +0300)
1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

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