]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 480a828 72e0265)
Merge commit 'origin/master' into diabolik/nexmodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 24 Jun 2010 03:54:55 +0000 (23:54 -0400)

Trivial merge