diff options
| author | Matthias Sohn | 2019-06-11 21:59:18 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2019-06-11 21:59:30 +0000 |
| commit | 667c783b5b8a37d94f4fa114ecc7352c66fef3f3 (patch) | |
| tree | 617f12f941ee77d800de92a3175d956b6bfbe0cf /org.eclipse.egit.target/egit-4.6.tpd | |
| parent | c702b73afed2b973dad788c6af0093d46e4f9a00 (diff) | |
| parent | a62e0b6023d470afc579e014868cc49c3bdd20fb (diff) | |
| download | egit-667c783b5b8a37d94f4fa114ecc7352c66fef3f3.tar.gz egit-667c783b5b8a37d94f4fa114ecc7352c66fef3f3.tar.xz egit-667c783b5b8a37d94f4fa114ecc7352c66fef3f3.zip | |
Merge branch 'master' into stable-5.4
* master:
Cleanup removal of adapter workaround
Handle absolute paths to SSH identity files
Remove pre-Mars adapter workaround
Update to Orbit R20190602212107
Commit editor and info builder: use progress callback for RevWalkUtils
History: show whitespace in the diff viewer
Factor out some actions from SpellcheckableMessageArea
Minor cleanup in SpellcheckableMessageArea (generics)
Use Arrays.asList instead of copying array in a for loop
Preferences: order of git config tabs
IllegalStateException when clearing credentials
Change-Id: Id937273311cd416ebe0031ec3494a70f367a2e33
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.target/egit-4.6.tpd')
| -rw-r--r-- | org.eclipse.egit.target/egit-4.6.tpd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd index 1865086cb9..6cdaddbe9c 100644 --- a/org.eclipse.egit.target/egit-4.6.tpd +++ b/org.eclipse.egit.target/egit-4.6.tpd @@ -2,5 +2,5 @@ target "egit-4.6" with source configurePhase include "projects/jetty-9.4.14.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20190521195709.tpd" +include "orbit/R20190602212107-2019-06.tpd" include "releasetrain/4.6-neon.tpd" |