]> 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: 8fcb2d0 912fd73)
Merge remote-tracking branch 'origin/master' into theshadow/aqueous theshadow/aqueous
authorPearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Fri, 20 Jan 2012 17:28:54 +0000 (12:28 -0500)
committerPearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Fri, 20 Jan 2012 17:28:54 +0000 (12:28 -0500)

Trivial merge