OSDN Git Service

Merge branch 'master' into new3dapi
authorbadlogic <badlogicgames@gmail.com>
Sat, 11 May 2013 20:05:36 +0000 (22:05 +0200)
committerbadlogic <badlogicgames@gmail.com>
Sat, 11 May 2013 20:05:36 +0000 (22:05 +0200)

Trivial merge