]> 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: 8c44e41 316b2df)
Merge commit 'origin/master' into diabolik/weaponscale
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 21:17:22 +0000 (17:17 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 21:17:22 +0000 (17:17 -0400)

Trivial merge