[netbeans] 04/05: Merge branch 'profiler'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository netbeans.

commit 60c9a56b0e3a2f36603013a651798f1f288aa699
Merge: ca393b9 4329d47
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Jun 29 20:30:32 2015 +0200

    Merge branch 'profiler'

 debian/control                                   |  1 +
 debian/patches/netbeans-cluster-properties.patch | 57 +++++++++++-------------
 debian/patches/netbeans-include-junit.patch      |  6 +--
 debian/patches/netbeans-profiler.patch           | 36 +++++++++++++++
 debian/patches/netbeans-slf4j.dummy.patch        |  4 +-
 debian/patches/series                            |  1 +
 debian/rules                                     | 14 +++++-
 7 files changed, 82 insertions(+), 37 deletions(-)

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