bt type
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding /game by Tony
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding /game by Tony
exit font
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding /game by Tony
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
exit font
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
exit font
	modified:   game/panel/handler.js
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
exit font
coding /game by Tony
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project
coding /game by Tony