OSDN Git Service

Merged scene2d-new branch back into trunk.
authornathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 2 Jul 2012 14:07:30 +0000 (14:07 +0000)
committernathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 2 Jul 2012 14:07:30 +0000 (14:07 +0000)

Trivial merge