]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f55e83 7183dd2)
Merge commit 'origin/master' into diabolik/sourceforplayers
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 3 Jun 2010 19:12:26 +0000 (15:12 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 3 Jun 2010 19:12:26 +0000 (15:12 -0400)

Trivial merge