summaryrefslogtreecommitdiff
path: root/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-09-04 13:25:33 -0700
committerTor Norbye <tnorbye@google.com>2014-09-04 13:25:33 -0700
commitd245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch)
treebca7d49005d81d10c70bc3f547df041c636b4300 /platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java
parent9cde0e3c015174898df8b8f3672185941fad4786 (diff)
parentc3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff)
downloadidea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java')
-rw-r--r--platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java
index 19cfbdf486eb..65b999f4c4db 100644
--- a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java
+++ b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java
@@ -40,6 +40,9 @@ public interface VcsLogFilterCollection {
VcsLogTextFilter getTextFilter();
@Nullable
+ VcsLogHashFilter getHashFilter();
+
+ @Nullable
VcsLogStructureFilter getStructureFilter();
/**