OSDN Git Service

Merge branch 'master' of https://github.com/mattdesl/libgdx into multipage-fonts
authormattdesl <dave.des@gmail.com>
Mon, 16 Sep 2013 01:07:34 +0000 (21:07 -0400)
committermattdesl <dave.des@gmail.com>
Mon, 16 Sep 2013 01:07:34 +0000 (21:07 -0400)
commitffab0469af912f402d675b82f3563e1ab18a1f2d
tree061e8e349162af6adef4bb6c749639069226bac6
parent10233f000ba1c808ee5e7b3f491e9dac7da48225
parentfdae126a6c0b39b2971828b7626a6940374985ca
Merge branch 'master' of https://github.com/mattdesl/libgdx into multipage-fonts

Conflicts:
CHANGES
CHANGES