]> 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: ef0a0db 2702276)
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic-data.pk3dir
authormand1nga <saulo_gil@argentina.com>
Thu, 18 Mar 2010 20:33:12 +0000 (17:33 -0300)
committermand1nga <saulo_gil@argentina.com>
Thu, 18 Mar 2010 20:33:12 +0000 (17:33 -0300)

Trivial merge