OSDN Git Service

merge
authorbadlogic <contact@badlogicgames.com>
Mon, 8 Oct 2012 23:31:46 +0000 (01:31 +0200)
committerbadlogic <contact@badlogicgames.com>
Mon, 8 Oct 2012 23:31:46 +0000 (01:31 +0200)
commit233c468b9c6c249dd3486215f3165462e5d2788e
treecc3494beafabcb7a0d63b84bec1e3ea28bcfd4c4
parent943f34ffde2b20326c982bfccdd77e37969ed671
parentbf41657afd6ef7df547934ac4079f6307a670271
merge