Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

改了不少 #30

Merged
merged 7 commits into from Apr 10, 2012
Merged

改了不少 #30

merged 7 commits into from Apr 10, 2012

Commits on Apr 8, 2012

  1. Merge branch 'master' of git://github.com/Leeforall/NFCShopping

    whoseyourdady committed Apr 8, 2012
    Copy the full SHA
    564f71c View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2012

  1. Merge branch 'master' of git://github.com/Leeforall/NFCShopping

    whoseyourdady committed Apr 9, 2012
    Copy the full SHA
    1caa877 View commit details
    Browse the repository at this point in the history

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

    whoseyourdady committed Apr 9, 2012
    Copy the full SHA
    ca7daa1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2012

  1. 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 committed Apr 10, 2012
    Copy the full SHA
    c470d73 View commit details
    Browse the repository at this point in the history

  2. 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 committed Apr 10, 2012
    Copy the full SHA
    a274f36 View commit details
    Browse the repository at this point in the history

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

    whoseyourdady committed Apr 10, 2012
    Copy the full SHA
    dcacaeb View commit details
    Browse the repository at this point in the history

  4. 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 committed Apr 10, 2012
    Copy the full SHA
    54e2b33 View commit details
    Browse the repository at this point in the history