diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2017-11-10 22:05:50 -0500 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2017-11-10 22:05:50 -0500 |
commit | 1a091ff5f93a6d9843abb7f57a0cb7ebee7df511 (patch) | |
tree | 6fd3b21077ef3ac8fee6dbcaeb5d8f37c70b5667 /org.eclipse.jgit/.settings | |
parent | c93c653ccf6a263e33dea2d2213186636a5a3b5a (diff) | |
parent | 19ef730d74d0bfff28cc1f5f8191188e45016c5c (diff) | |
download | jgit-1a091ff5f93a6d9843abb7f57a0cb7ebee7df511.tar.gz jgit-1a091ff5f93a6d9843abb7f57a0cb7ebee7df511.zip |
Merge changes I335587ee,I4182a174
* changes:
Merge branch 'stable-4.9'
Remove an unused import from PackParserTest
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 034b20f901..20d08c3a00 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -35,6 +35,18 @@ <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/> </message_arguments> </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="3.5"/> + <message_argument value="4.9"/> + <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/> + </message_arguments> + </filter> </resource> <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection"> <filter id="403767336"> |