]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f791cb 38a4927)
Merge remote branch 'origin/master' into samual/lightning_gun
authorSamual <samual@xonotic.org>
Sun, 13 Mar 2011 20:47:44 +0000 (16:47 -0400)
committerSamual <samual@xonotic.org>
Sun, 13 Mar 2011 20:47:44 +0000 (16:47 -0400)

Trivial merge