You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2017/11/14 14:23:57 UTC

[incubator-netbeans] 01/01: Merge pull request #273 from thurka/thurka/after_donation

This is an automated email from the ASF dual-hosted git repository.

geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 6ee4827754d427b12c6748146f894576d9df6442
Merge: 364308b 3b5aa08
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Tue Nov 14 15:23:53 2017 +0100

    Merge pull request #273 from thurka/thurka/after_donation
    
    Backport of thurka's fixes made after Apr 22, 2017

 api.intent/manifest.mf                             |  2 +-
 .../core/startup/ModuleLifecycleManager.java       |  3 ++-
 .../nativeexecution/support/Win32APISupport.java   |  2 +-
 .../modules/keyring/gnome/GnomeKeyringLibrary.java |  2 +-
 .../org/netbeans/lib/profiler/heap/ClassDump.java  |  2 +-
 .../lib/profiler/heap/HprofArrayValue.java         | 16 +++++++++++-----
 .../org/netbeans/lib/profiler/heap/HprofHeap.java  | 21 ++++++++++++++++-----
 libs.jna.platform/external/binaries-list           |  2 +-
 ...-license.txt => jna-platform-4.4.0-license.txt} |  2 +-
 libs.jna.platform/nbproject/project.properties     |  2 +-
 libs.jna.platform/nbproject/project.xml            |  4 ++--
 libs.jna/external/binaries-list                    |  2 +-
 ...jna-4.2.2-license.txt => jna-4.4.0-license.txt} |  2 +-
 libs.jna/manifest.mf                               |  2 +-
 libs.jna/nbproject/project.properties              | 22 +++++++++++-----------
 libs.jna/nbproject/project.xml                     |  4 ++--
 libs.jna/src/org/netbeans/libs/jna/Installer.java  |  2 +-
 .../openide/explorer/view/CustomPopupFactory.java  |  2 ++
 profiler.oql/nbproject/project.xml                 |  2 +-
 .../oql/engine/api/impl/ReachableObjects.java      | 21 ++++++++++++++++++---
 .../profiler/oql/engine/api/impl/Snapshot.java     | 22 ++++++++++++++++++++++
 .../modules/profiler/oql/engine/api/impl/hat.js    | 19 +++++++++++++++++--
 22 files changed, 115 insertions(+), 43 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.