ignore

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
ignore

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
Merge branch 'develop' of https://github.com/wang-yichun/GravityMapCreater into develop_ios

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>

Conflicts:
	proj.ios/.DS_Store
reflesh ignore

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>
Merge branch 'refs/heads/master' into develop_ios

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>

Conflicts:
	proj.ios/.DS_Store
消除黑边的方法写在AppDelegate的注释中

Signed-off-by: wang-yichun <wang-yichun@meyougames.com>