Skip to content
This repository was archived by the owner on Sep 17, 2019. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: googlearchive/android-BasicMultitouch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: zhangjunquan/android-BasicMultitouch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 7 files changed
  • 1 contributor

Commits on Feb 24, 2015

  1. 添加忽略文件

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    7171b4c View commit details
    Browse the repository at this point in the history

  2. 初始导入

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    6d0eabb View commit details
    Browse the repository at this point in the history

  3. 修改忽略文件

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    041a783 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:googlesamples/android-BasicMultit… 

    …ouch

Conflicts:
	Application/src/main/res/layout/activity_main.xml
	gradlew
    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    d11b4c1 View commit details
    Browse the repository at this point in the history

  5. 修改

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    33ef1c1 View commit details
    Browse the repository at this point in the history

  6. 复原图片地址

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    3601c40 View commit details
    Browse the repository at this point in the history

  7. 修改图片地址

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    0772230 View commit details
    Browse the repository at this point in the history

  8. 修改图片地址

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    8f94f5e View commit details
    Browse the repository at this point in the history

  9. 修改图片地址

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    9453315 View commit details
    Browse the repository at this point in the history

  10. 删除以前的图片地址

    @zhangjunquan
    zhangjunquan committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    653ffde View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. 阅读代码，给予一定的说明

    @zhangjunquan
    zhangjunquan committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    540ccb3 View commit details
    Browse the repository at this point in the history
Loading