]> 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: 832e35e 1b5359b)
Merge remote branch 'origin/master' into diabolik/techpanel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 Aug 2010 17:33:28 +0000 (13:33 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 Aug 2010 17:33:28 +0000 (13:33 -0400)

Trivial merge