i don't know why
reset submodule
Merge branch 'combine-jsb' of github.com:natural-law/cocos2d-x into combine-jsb
Merge branch 'combine-jsb' of github.com:natural-law/cocos2d-x into combine-jsb
add jsb project file
merge js project file
modify submodule
fix submodule bug
roll back submodule version
Merge pull request #2 from calfjohn/combine-jsb

Combine jsb