]> 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: fb44eb1 f42e5b5)
Merge remote-tracking branch 'origin/samual/create_scrshot_ent'
authorSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 21:00:41 +0000 (17:00 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 21:00:41 +0000 (17:00 -0400)

Trivial merge