]> 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 | compact (merge: 8822af5 70c8c59)
Merge commit 'origin/master' into diabolik/umbraplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 8 May 2010 19:14:59 +0000 (15:14 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 8 May 2010 19:14:59 +0000 (15:14 -0400)

Trivial merge