]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a14f08 38b5218)
Merge branch 'master' into theshadow/aqueous
authorPearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Fri, 20 May 2011 16:47:46 +0000 (12:47 -0400)
committerPearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Fri, 20 May 2011 16:47:46 +0000 (12:47 -0400)

Trivial merge