Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-05-25 11:19:45 +0000
committerMatthias Sohn2016-05-25 11:23:56 +0000
commitb21214bd3f3187208b2147f79b19646a6e6568fc (patch)
tree5f4feea151ab2e23cc98dd68bf70d929ff278f44 /org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
parent78800c6dd770fcb36fd7788ec987e79772a7044d (diff)
parentd58c936fa4cc6e1d412a419aa9f931dbd645f7f2 (diff)
downloadegit-b21214bd3f3187208b2147f79b19646a6e6568fc.tar.gz
egit-b21214bd3f3187208b2147f79b19646a6e6568fc.tar.xz
egit-b21214bd3f3187208b2147f79b19646a6e6568fc.zip
Merge branch 'master' into stable-4.4
* master: Create push wizards in CommitJob in UI thread Fix NPE in AbstractRebaseCommandHandler$1.done() Fix NPE in GitSelectRepositoryPage.refreshRepositoryList() Fix NPE in PushBranchWizard.startPush() Fix NPE in ResourceUtil.isSharedWithGit() Catch IOException in ConfigureGerritAfterCloneTask Replace uses of deprecated Repository.getRef() Ensure Git is closed using try with resource Check HandlerUtil.getActiveSite(event) result to avoid NPE's Prepare 4.3.2-SNAPSHOT builds Ensure compatibility with pre-Mars Eclipse Update Orbit repository to S20160518051658 for Neon RC2 Relayout buttons after enabling check for warnings Add accelerators for "Compare With" and "Replace With" commands New convenience commands to compare/replace with Gitflow develop branch Mark branding plugin and gitflow plugin as singletons [releng] p2.inf to remove the old importer fragment [findBugs] Fix potential NPE in RepositoryMapping Remove duplicate rename branch dialog [findBugs] Avoid unnecessary boxing when parsing int from String Replace use of deprecated Repository.getRef() method Ensure Git is closed using try with resource Remove unnecessary @SuppressWarnings("resource") Exclude labels from tab stop Mark current feature-branch and prevent attempted re-checkout Ignore SmartImportWizardTest [releng] Include missing extension point schemas in EGit binaries [releng] Importer fragment must have host bundle version constraint Leave the commit message enabled in staging view Adapt target platform to changed Neon staging p2 repository [releng] Importer fragment must have host bundle version constraint Topic input on PushToGerritPage Add "Open in Commit Viewer" in context menu of stashed commit Handle linked resources in the same repository Refactor code: simplification, and avoid findbugs warning Set repository when opening staging view from commit action Test stability: one "widget disposed" message is enough EGit v4.3.1.201605051710-r Test stability: really shut down repositories Fix typo in testcase name Fix wrong cursor position while editing URIs Test stability: wait for repositories view refresh after config change [memory leak] make sure we only allow one GitHistoryPageSource instance Prevent NPE in ProjectUtil.getProjectsUnderPath(IPath) Change-Id: I13ee8cfb7648a356dfca9e2c86b9ffb5d92ebe84 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF')
-rw-r--r--org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
index c9c31c7282..2bba633592 100644
--- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@ Import-Package: org.eclipse.egit.core;version="[4.4.0,4.5.0)",
org.eclipse.egit.ui.internal.branch;version="[4.4.0,4.5.0)",
org.eclipse.egit.ui.internal.commit;version="[4.4.0,4.5.0)",
org.eclipse.egit.ui.internal.history;version="[4.4.0,4.5.0)",
+ org.eclipse.egit.ui.internal.operations;version="[4.4.0,4.5.0)",
org.eclipse.egit.ui.internal.rebase;version="[4.4.0,4.5.0)",
org.eclipse.egit.ui.internal.repository.tree;version="[4.4.0,4.5.0)",
org.eclipse.egit.ui.internal.selection;version="[4.4.0,4.5.0)",

Back to the top