]> 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: f0e4cbd fb44eb1)
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
authorSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 16:02:34 +0000 (12:02 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 16:02:34 +0000 (12:02 -0400)

Trivial merge