]> 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: eaba531 f32862e)
Merge remote-tracking branch 'origin/mirceakitsune/scoreboard_respawn_info'
authorSamual Lenks <samual@xonotic.org>
Sun, 2 Dec 2012 18:57:06 +0000 (13:57 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 2 Dec 2012 18:57:06 +0000 (13:57 -0500)

Trivial merge