qinjiaming_branch 84c742190f Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666		2016-08-30 08:11:07 +08:00
..
.settings	修改	2016-08-29 10:29:16 +08:00
bin	Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666	2016-08-30 08:11:07 +08:00
gen/com/stone/shop	修改	2016-08-29 10:29:16 +08:00
libs	修改	2016-08-29 10:29:16 +08:00
res	合并赵再春。	2016-08-29 10:53:35 +08:00
src/com/stone	Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666	2016-08-30 08:11:07 +08:00
.DS_Store	修改	2016-08-29 10:29:16 +08:00
.classpath	文档和模型中的子系统顺序图	2016-08-29 11:00:05 +08:00
.project	修改	2016-08-29 10:29:16 +08:00
AndroidManifest.xml	修改	2016-08-29 10:29:16 +08:00
ic_launcher-web.png	修改	2016-08-29 10:29:16 +08:00
lint.xml	修改	2016-08-29 10:29:16 +08:00
proguard-project.txt	修改	2016-08-29 10:29:16 +08:00
project.properties	文档和模型中的子系统顺序图	2016-08-29 11:00:05 +08:00
project.properties~remotes_origin_zhaozaichun	合并赵再春。	2016-08-29 10:53:35 +08:00