]> 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: 758880a a2fe643)
Merge branch 'master' into mirceakitsune/playermodel_draconi
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 10 May 2014 15:51:10 +0000 (18:51 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 10 May 2014 15:51:10 +0000 (18:51 +0300)

Trivial merge