merge The9
set compile in windows
compile error in bpg_pkg_encode.c
net_trans bug fix
gd.app支持新的加载方式
读入二进制大文件的bug
cpe supprt android asset
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge branch 't/support/game' into refs/top-bases/t/support/usf
Merge commit 'refs/top-bases/t/support/game' into t/support/game
merge
merge
Merge branch 't/support/usf' into refs/top-bases/t/support/mongo
Merge commit 'refs/top-bases/t/support/mongo' into t/support/mongo
Merge commit 'refs/top-bases/t/svr/env' into t/svr/env
merge
Merge branch 't/support/usf' into refs/top-bases/t/svr/usf

Conflicts:
	include/cpe/cfg/cfg_manage.h

merge
Merge commit 'refs/top-bases/t/svr/usf' into t/svr/usf
Merge branch 't/svr/env' into refs/top-bases/t/svr/payment

Conflicts:
	include/cpe/cfg/cfg_manage.h
	src/cpe/cfg/cfg_bin_read.c
	src/cpe/cfg/tests-ut/BinTest.cpp
	src/cpe/cfg/tests-ut/BinTest.hpp
	src/cpe/cfg/tests-ut/test_bin_basic.cpp
Merge branch 't/svr/usf' into refs/top-bases/t/svr/payment