]> 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: b5ae149 e68a352)
Merge remote branch 'origin/master' into theshadow/aqueous
authorPearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Sat, 29 Jan 2011 19:07:44 +0000 (14:07 -0500)
committerPearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Sat, 29 Jan 2011 19:07:44 +0000 (14:07 -0500)

Trivial merge