[netbeans] branch master updated (6d9423f -> 49846a4)

[Markus Koschany]

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

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

      from  6d9423f   Update changelog
       new  0d799b3   Revert "Merge branch 'profiler'"
       new  49846a4   Revert "Update changelog"

The 2 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                                   |  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 +-----
 8 files changed, 37 insertions(+), 93 deletions(-)
 delete mode 100644 debian/patches/netbeans-profiler.patch

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