OSDN Git Service

merged changes from master
authorbadlogic <badlogicgames@gmail.com>
Sun, 29 Sep 2013 20:56:22 +0000 (22:56 +0200)
committerbadlogic <badlogicgames@gmail.com>
Sun, 29 Sep 2013 20:56:22 +0000 (22:56 +0200)
commit11bbd67bc5e8b92add8a1cf89f042aea5632d104
tree8fdd1c044d40e9cf1680245584113744452ee523
parent7dc32cb597d21c1e12a2bce4d31041e28062ca57
parent485f83b7d30373a71e9dbb125309ae1a41954c67
merged changes from master