改了不少 #30

Merged
merged 7 commits into from Apr 10, 2012

Conversation

Projects
None yet
2 participants
@whoseyourdady
Collaborator

whoseyourdady commented Apr 10, 2012

改了不少

whoseyourdady added some commits Apr 8, 2012

whoseyourdady
Merge branch 'master' of git://github.com/Leeforall/NFCShopping
Conflicts:
	mobile phone client/NFCShopping/src/scut/bgooo/ui/CommentListActivity.java

Signed-off-by: whoseyourdady <whoseyourdady@sina.cn>
whoseyourdady
Merge branch 'master' of git://github.com/Leeforall/NFCShopping
Conflicts:
	mobile phone client/NFCShopping/src/scut/bgooo/ui/ProductActivity.java

Signed-off-by: whoseyourdady <whoseyourdady@sina.cn>
whoseyourdady
Merge branch 'master' of git://github.com/Leeforall/NFCShopping
Conflicts:
	mobile phone client/NFCShopping/src/scut/bgooo/ui/ProductActivity.java

Signed-off-by: whoseyourdady <whoseyourdady@sina.cn>

RealOuO added a commit that referenced this pull request Apr 10, 2012

@RealOuO RealOuO merged commit b6563df into RealOuO:master Apr 10, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment