]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 475bf72 cfea2c6)
Merge remote branch 'origin/master' into diabolik/facility114-team
authorSahil Singhal <sahil@sahil-desktop.(none)>
Tue, 24 Aug 2010 06:37:00 +0000 (02:37 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Tue, 24 Aug 2010 06:37:00 +0000 (02:37 -0400)

Trivial merge