Merge from master.
authorchsieh <chester.developer@hotmail.com>
Tue, 17 May 2011 04:21:48 +0000 (21:21 -0700)
committerchsieh <chester.developer@hotmail.com>
Tue, 17 May 2011 04:21:48 +0000 (21:21 -0700)
commit262b134d192d10797b47509f455ce09213a3e5b2
tree96b5d388f31f12559ed570135063c404e0b38583
parentda929cb8a2cede8716582a26f0d2acdd559ad824
parenteadb29b339a1c0e91382265d7fc18359ebfe58e7
Merge from master.
src/game/actor/Unit.h
src/game/actor/Unit.mm
src/render/animation/AnimationContainer.h
src/render/animation/AnimationContainer.mm