Skip to content

张胜利 / Androidgroup

Go to a project
Commit 312f84ce by 黄梦钦
Options

Merge branch 'zsl2' of http://192.168.3.209/zhangshengli/androidgroup

parents 78911cbe 4addc705
Inline Side-by-side
Showing with 6 additions and 1 deletions
imageLoader/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java
...@@ -26,7 +26,11 @@ import java.io.InputStream; ...@@ -26,7 +26,11 @@ import java.io.InputStream;
* Interface for disk cache * Interface for disk cache
* *
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com) * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
* @since 1.9.2 <<<<<<< HEAD
* @since 1.9.1
=======
* @since 1.8.2
>>>>>>> 60c2ed3dd69f390d535e0e9eefcf05fcfbf21102
*/ */
public interface DiskCache { public interface DiskCache {
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment