]> 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: 41dcf42 694fc4b)
Merge remote-tracking branch 'origin/terencehill/sv_maxidle_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 13 May 2013 03:23:11 +0000 (23:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 13 May 2013 03:23:11 +0000 (23:23 -0400)

Trivial merge