This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane.
commit b9fe3eb6531b08ba90c59aabcf7e0152efbae5e3 Merge: 65ad79f daf7fc3 Author: Felix Natter <[email protected]> Date: Sat Aug 27 13:16:12 2016 +0200 Merge tag 'upstream/1.5.15' Upstream version 1.5.15 freeplane/doc/history_en.txt | 4 ++ .../resources/default_accelerators_mac.properties | 1 + .../resources/translations/Resources_nl.properties | 59 +++++++++++----------- .../freeplane/core/util/FreeplaneIconUtils.java | 22 +++++++- .../java/org/freeplane/core/util/Quantity.java | 5 ++ .../features/attribute/AttributeRegistry.java | 3 +- .../features/icon/factory/ImageIconFactory.java | 3 +- .../org/freeplane/features/map/MapController.java | 2 + .../mindmapmode/MLocationController.java | 2 +- .../mindmapmode/MNodeStyleController.java | 4 +- .../features/text/mindmapmode/JoinNodesAction.java | 2 +- .../main/mindmapmode/UpdateCheckAction.java | 4 +- .../org/freeplane/view/swing/map/MapScroller.java | 2 + .../java/org/freeplane/view/swing/map/MapView.java | 4 ++ .../org/freeplane/view/swing/map/NodeView.java | 2 +- .../view/swing/ui/DefaultMouseWheelListener.java | 3 +- .../org/freeplane/core/util/QuantityShould.java | 7 +++ .../translations/Resources_en.properties | 37 +------------- freeplane/viewer-resources/version.properties | 2 +- .../windows-installer/Freeplane_without_Java.iss | 2 +- .../windows-portable/App/AppInfo/appinfo.ini | 4 +- .../scripts/installScriptAddOn.groovy | 9 ++-- gitinfo.properties | 2 +- gitinfo.txt | 2 +- 24 files changed, 100 insertions(+), 87 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
