OSDN Git Service

Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi
authorXoppa <contact@xoppa.nl>
Sat, 6 Jul 2013 16:30:46 +0000 (18:30 +0200)
committerXoppa <contact@xoppa.nl>
Sat, 6 Jul 2013 16:30:46 +0000 (18:30 +0200)

Trivial merge