Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-08-25 14:07:20 +0000
committerMatthias Sohn2018-08-25 14:14:22 +0000
commit851f2399515db1f06496b47eefa51a8c5b0c86d7 (patch)
tree28146db175edf15ed0d7d50d7c46e8823ffb9625 /org.eclipse.jgit.ui
parent5786ac991bd28c502613c7cddc7b4fdd01f8346d (diff)
parentcde0e313819c0209eb692820fb32f85e5b034e16 (diff)
downloadjgit-851f2399515db1f06496b47eefa51a8c5b0c86d7.tar.gz
jgit-851f2399515db1f06496b47eefa51a8c5b0c86d7.tar.xz
jgit-851f2399515db1f06496b47eefa51a8c5b0c86d7.zip
Merge branch 'stable-5.0'
* stable-5.0: Silence API warning for new ObjectIdSerializer introduced in 4.11.1 Ignore API warnings Fix photon target platform to use photon version of org.eclipse.osgi Update Photon orbit repository to R20180606145124 Suppress warning for trying to delete non-empty directory Fix fetching with duplicate ref updates Fetch(Process): should tolerate duplicate refspecs FetchCommandTest: test add/update/delete fetch Change-Id: I9e7fa37b100a7ea3cbe4104802d36c6f38df9e08 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ui')
-rw-r--r--org.eclipse.jgit.ui/.settings/.api_filters11
1 files changed, 0 insertions, 11 deletions
diff --git a/org.eclipse.jgit.ui/.settings/.api_filters b/org.eclipse.jgit.ui/.settings/.api_filters
deleted file mode 100644
index aed9c7a352..0000000000
--- a/org.eclipse.jgit.ui/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit.ui" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter id="925892614">
- <message_arguments>
- <message_argument value="5.0.0"/>
- <message_argument value="4.11.0"/>
- </message_arguments>
- </filter>
- </resource>
-</component>

Back to the top