search

Relfos / TERRA-Engine

Cross platform game engine written in Object Pascal.
http://www.pascalgameengine.com
Apache License 2.0
103 stars 41 forks source link

Ui refactor #4

Closed auoks closed 8 years ago

Relfos commented 8 years ago

Hi, it seems there are some conflicts in the two branches, this needs to be sorted out before we merge it to master. Let me check it

auoks commented 8 years ago

ok You adjust it. And tell me

Relfos commented 8 years ago

Ok, it's done. The master now contains all updates from the last week.

On Wed, Sep 16, 2015 at 6:26 PM, auoks notifications@github.com wrote:

ok You adjust it. And tell me

— Reply to this email directly or view it on GitHub https://github.com/Relfos/TERRA-Engine/pull/4#issuecomment-140811924.