This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository pleiades.
commit 4129719ad8b888c0de47efc7424ff5ac96ac1b6a Merge: 1a37a8a 3c337ab Author: Hideki Yamane <[email protected]> Date: Wed Jul 1 13:40:28 2015 +0900 Merge tag 'upstream/1.6.0' Upstream version 1.6.0 .keystore | Bin 1238 -> 1239 bytes .../mergedoc/pleiades/aspect/AsyncQueue.class | Bin 2910 -> 2805 bytes build.xml | 13 +- conf/pleiades-config.xml | 35 +- conf/props/additions/BSD/FreeMarker.properties | 3 + conf/props/additions/BSD/PMD.properties | 2 +- conf/props/additions/EPL/Eclipse_4.4.properties | 38 + conf/props/additions/EPL/Eclipse_4.5.properties | 57 + conf/props/additions/EPL/Eclipse_CDT.properties | 99 ++ .../Eclipse_DLTK-ATF_200811_contributed.properties | 2 +- conf/props/additions/EPL/Eclipse_EGit.properties | 161 ++- conf/props/additions/EPL/Eclipse_Mylyn.properties | 2 + conf/props/additions/EPL/Eclipse_Oomph.properties | 31 + .../additions/EPL/Eclipse_Subversive.properties | 13 + .../additions/EPL/Eclipse_UpdateManager.properties | 230 ++++ conf/props/additions/EPL/Eclipse_WTP.properties | 333 +++++ .../additions/EPL/Eclipse_buildship.properties | 78 ++ conf/props/additions/EPL/Eclipse_m2e.properties | 17 + conf/props/additions/EPL/EditBox.properties | 25 + conf/props/additions/EPL/GradleIDE.properties | 75 ++ conf/props/additions/EPL/Jadclipse.properties | 13 + .../org.eclipse-jee-galileo-20091018-6.properties | 112 +- .../org.eclipse-jee-galileo-20091022-1.properties | 102 +- .../additions/GPL/EditorEnhancements.properties | 1 - conf/props/additions/LGPL/FindBugs.properties | 8 + .../props/additions/LGPL/TomcatLauncher.properties | 2 + conf/props/additions/OTHER/Android.properties | 6 + conf/props/additions/OTHER/JBossTools.properties | 82 ++ conf/props/additions/OTHER/JDEclipse.properties | 4 + conf/props/additions/exclude-EPL.properties | 4 +- conf/props/additions/exclude-OTHER.properties | 4 +- conf/props/additions/regex-BSD.properties | 4 +- conf/props/additions/regex-EPL.properties | 12 +- conf/props/additions/regex-OTHER.properties | 5 +- conf/props/nls-ui-customized.properties | 4 +- conf/props/temp-all.properties | 1280 +++++++++++++++++++- conf/props/temp-nls-ui-customized.properties | 6 +- conf/props/translation-BSD.properties | 9 +- conf/props/translation-EPL.properties | 1174 +++++++++++++++++- conf/props/translation-GPL.properties | 5 +- conf/props/translation-LGPL.properties | 14 +- conf/props/translation-OTHER.properties | 95 +- conf/props/validation-ignore.properties | 5 + conf/splash4.5.bmp | Bin 0 -> 409566 bytes conf/splash4.5.png | Bin 0 -> 877162 bytes conf/translation-exclude-package.properties | 4 +- conf/translation-multibytes-key.properties | 5 +- conf/translation-regex.properties | 15 +- conf/translation.properties | 1280 +++++++++++++++++++- ...des-1.5.0.I20140625 => pleiades-1.6.0.I20150624 | 0 readme/readme_pleiades.txt | 22 +- readme/readme_pleiades_changes.txt | 14 + .../mergedoc/pleiades/aspect/AsyncQueue.java | 6 + .../pleiades/aspect/TranslationTransformer.java | 2 +- .../resource/DynamicTranslationDictionaryTest.java | 17 +- .../resource/TranslationDictionaryTest.java | 29 + 56 files changed, 5350 insertions(+), 209 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pleiades.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
