summaryrefslogtreecommitdiff
path: root/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 20:44:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-04 20:44:01 +0000
commitfb5a02906f644d044eb0286bf27d413ba0e05216 (patch)
treebca7d49005d81d10c70bc3f547df041c636b4300 /platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java
parent9cde0e3c015174898df8b8f3672185941fad4786 (diff)
parentd245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff)
downloadidea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java')
-rw-r--r--platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java
index acd39bf51b18..71a14e1f732d 100644
--- a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java
+++ b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogHashFilter.java
@@ -15,10 +15,13 @@
*/
package com.intellij.vcs.log;
+import org.jetbrains.annotations.NotNull;
+
import java.util.Collection;
public interface VcsLogHashFilter {
- Collection<Hash> getHashes();
+ @NotNull
+ Collection<String> getHashes();
}