]> de.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: 85e4c6f f0010ed)
Merge commit 'origin/master' into diabolik/seraphinaplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sun, 13 Jun 2010 05:35:44 +0000 (01:35 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sun, 13 Jun 2010 05:35:44 +0000 (01:35 -0400)

Trivial merge