Skip to content
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: lingochamp/FileDownloader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: weatherfish/FileDownloader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 9 commits
  • 6 files changed
  • 2 contributors

Commits on Sep 20, 2016

  1. gg

    weatherfish committed Sep 20, 2016
    Copy the full SHA
    a95ea12 View commit details
  2. Merge remote-tracking branch 'lingochamp/master'

    # Conflicts:
    #	.idea/compiler.xml
    #	.idea/copyright/profiles_settings.xml
    #	.idea/gradle.xml
    #	.idea/misc.xml
    weatherfish committed Sep 20, 2016
    Copy the full SHA
    4d88569 View commit details

Commits on Nov 5, 2016

  1. Copy the full SHA
    3cfecf3 View commit details

Commits on Dec 18, 2016

  1. Copy the full SHA
    2272225 View commit details

Commits on Jan 13, 2017

  1. Merge remote-tracking branch 'lingochamp/master'

    # Conflicts:
    #	.idea/misc.xml
    weatherfish committed Jan 13, 2017
    Copy the full SHA
    e3dc39b View commit details

Commits on Feb 1, 2017

  1. Copy the full SHA
    51e6f59 View commit details

Commits on Feb 19, 2017

  1. Copy the full SHA
    72ecca7 View commit details

Commits on Mar 14, 2017

  1. Merge remote-tracking branch 'lingochamp/master'

    01174599 committed Mar 14, 2017
    Copy the full SHA
    f65effc View commit details

Commits on Mar 20, 2017

  1. Merge remote-tracking branch 'lingochamp/master'

    01174599 committed Mar 20, 2017
    Copy the full SHA
    177f82a View commit details
Showing with 129 additions and 0 deletions.
  1. +1 −0 .idea/.name
  2. +7 −0 .idea/compiler.xml
  3. +4 −0 .idea/copyright/profiles_settings.xml
  4. +7 −0 .idea/gradle.xml
  5. +90 −0 .idea/misc.xml
  6. +20 −0 demo/src/main/java/com/liulishuo/filedownloader/demo/MyView.java
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 90 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions demo/src/main/java/com/liulishuo/filedownloader/demo/MyView.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.liulishuo.filedownloader.demo;

import android.content.Context;
import android.view.View;

/**
* Created by weatherfish on 16/3/7.
*/

public class MyView extends View {

public MyView(Context context) {
super(context);
}

@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
}