]> 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: 06b6208 18d6521)
Merge commit 'origin/master' into diabolik/weaponscale
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 18:16:28 +0000 (14:16 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 18:16:28 +0000 (14:16 -0400)

Trivial merge