Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-08-25 06:56:45 +0000
committerMatthias Sohn2018-08-25 06:56:45 +0000
commitcde0e313819c0209eb692820fb32f85e5b034e16 (patch)
treed2501639233921231dd3ce0aab960676120b8808 /org.eclipse.jgit.ui
parent78d7d9916cb84142f0ca03fbeb3a176c4223255e (diff)
parent2dfc9ed6d21567a04a8ec3f98ab21ed04fc8c531 (diff)
downloadjgit-cde0e313819c0209eb692820fb32f85e5b034e16.tar.gz
jgit-cde0e313819c0209eb692820fb32f85e5b034e16.tar.xz
jgit-cde0e313819c0209eb692820fb32f85e5b034e16.zip
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11: 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: I2497f99b7d0686a0e0f773c39c8725e813ce9d4a 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