This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane.
commit 891fb4e09f429e946ca5a1da019ee264707b0ee3 Merge: 7f8ddbb cbb85de Author: Felix Natter <[email protected]> Date: Sat Mar 28 13:41:04 2015 +0100 Merge tag 'upstream/1.3.15' Upstream version 1.3.15 freeplane/doc/history_en.txt | 9 + freeplane/resources/xml/mindmapmoderibbon.out.xml | 509 + .../resources/xslt/freeplane_version_updater.xslt | 2 +- .../org/freeplane/core/ui/components/UITools.java | 2 +- .../src/org/freeplane/core/util/HtmlUtils.java | 17 +- .../freeplane/core/util/XsltPipeReaderFactory.java | 103 +- .../attribute/AttributeMatchesCondition.java | 2 +- .../freeplane/features/help/HotKeyInfoAction.java | 9 +- .../features/map/mindmapmode/MMapController.java | 5 +- .../features/text/NodeMatchesRegexpCondition.java | 2 +- .../features/url/CleaningInputStream.java | 111 - .../features/url/MapVersionInterpreter.java | 2 +- .../src/org/freeplane/features/url/UrlManager.java | 3 +- .../nodelist/FlatNodeTableFilterModel.java | 2 +- .../time/mindmapmode/nodelist/NodeList.java | 2 +- .../time/mindmapmode/nodelist/TextHolder.java | 2 +- .../view/swing/map/attribute/AttributeTable.java | 23 +- .../freeplane/view/swing/ui/MenuXmlCreator.java | 2 +- freeplane/viewer-resources/version.properties | 2 +- .../eclipse/freeplane knopflerfish mac.launch | 24 + .../eclipse/freeplane knopflerfish.launch | 18 +- .../eclipse/freeplane-osgi-mac.launch | 2 +- freeplane_devresources/test/map_10000-7-7-0-0-0.mm | 40024 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 12 + freeplane_framework/ant/build.xml | 112 +- .../freeplane.icns | Bin .../freeplanedoc.icns | Bin .../mac_info_plist.xslt | 23 +- freeplane_framework/script/freeplane.sh | 30 +- .../src/org/freeplane/launcher/Launcher.java | 2 +- .../windows-installer/Freeplane_without_Java.iss | 2 +- .../windows-portable/App/AppInfo/appinfo.ini | 4 +- 32 files changed, 40766 insertions(+), 296 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
