[freeplane] branch master updated (7f8ddbb -> cd145ea)

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a change to branch master
in repository freeplane.

      from  7f8ddbb   java6-runtime->java7-runtime
       new  cbb85de   Imported Upstream version 1.3.15
       new  891fb4e   Merge tag 'upstream/1.3.15'
       new  8f5782d   fix 20_freeplane_sh.patch for 1.3.15
       new  0eabcc1   require libknopflerfish-osgi-framework-java 5.1.0, use groovy2
       new  8eb7c71   update changelog for 1.3.15-1
       new  cd145ea   update man page for 1.3.15

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                                   |    11 +-
 debian/control                                     |     8 +-
 debian/freeplane.1.xml                             |     8 +-
 debian/patches/10_libraries_properties.patch       |     3 +-
 debian/patches/15_libraries_manifest.patch         |     2 +-
 debian/patches/20_freeplane_sh.patch               |    14 +-
 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           |     1 +
 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 +-
 38 files changed, 40780 insertions(+), 317 deletions(-)
 create mode 100644 freeplane/resources/xml/mindmapmoderibbon.out.xml
 delete mode 100644 freeplane/src/org/freeplane/features/url/CleaningInputStream.java
 create mode 100644 freeplane_devresources/eclipse/freeplane knopflerfish mac.launch
 create mode 100644 freeplane_devresources/test/map_10000-7-7-0-0-0.mm
 copy {freeplane_plugin_workspace => freeplane_framework}/.settings/org.eclipse.jdt.core.prefs (87%)
 rename freeplane_framework/{mac-jarbundler => mac-appbundler}/freeplane.icns (100%)
 rename freeplane_framework/{mac-jarbundler => mac-appbundler}/freeplanedoc.icns (100%)
 rename freeplane_framework/{mac-jarbundler => mac-appbundler}/mac_info_plist.xslt (62%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git