]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad6b3f8 19fc688)
Merge remote-tracking branch 'origin/nifrek/playermodels_sources'
authormerlijn <mhofstra@gmail.com>
Sat, 7 Jan 2012 10:55:39 +0000 (11:55 +0100)
committermerlijn <mhofstra@gmail.com>
Sat, 7 Jan 2012 10:55:39 +0000 (11:55 +0100)

Trivial merge