添加包
123
部分UI
UI部分设计
实体类
Merge branch 'dev' of github.com:Java3-2/Card-English into dev
1
UI
冲突解决
Merge branch 'dev' of https://github.com/Java3-2/Card-English into dev

Conflicts:
	CardEnglish/src/com/Mars/domain/Entity/Word.java
注册
Merge branch 'dev' of github.com:Java3-2/Card-English into dev
注册1
UI优化
Merge branch 'dev' of https://github.com/Java3-2/Card-English into dev

Conflicts:
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$id.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$layout.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$menu.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$string.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$style.class
	CardEnglish/gen/com/java3_2/cardengilsh/R.java
语音合成
android 栈优化
封装数据层
Merge branch 'dev' of https://github.com/Java3-2/Card-English into dev
语音合成优化
Merge branch 'dev' of github.com:Java3-2/Card-English into dev