]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/playermodel_draconi
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 25 Jan 2011 15:45:37 +0000 (17:45 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 25 Jan 2011 15:45:37 +0000 (17:45 +0200)
commit68261938008df69abfd9c6dc5f6baeea232c557c
tree8a686d438ebe2feb7f8f5f326922b5e3f3a875f8
parentcb5a1bcc4731e420a3be24881d1d93b6d146d4c8
parentd7cca4c6d0a76ece4262414d5675f9f1da13af59
Merge branch 'master' into mirceakitsune/playermodel_draconi