]> 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: 221e724 2e23497)
Merge branch 'master' into mirceakitsune/playermodel_draconi
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:17:22 +0000 (15:17 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:17:22 +0000 (15:17 +0300)

Trivial merge