[bridge-method-injector] 01/02: Merge tag 'upstream/1.13'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository bridge-method-injector.

commit a29421c11b0d2d3c46f6ad730e1760c01d766af2
Merge: 40a51aa 47e9112
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 15 08:38:49 2014 +0200

    Merge tag 'upstream/1.13'
    
    Upstream version 1.13

 annotation/pom.xml                                 |   2 +-
 .../bridge_method_injector/WithBridgeMethods.java  |   6 +-
 injector/pom.xml                                   |  21 +++-
 .../ClassAnnotationInjector.java                   |   6 +-
 .../bridge_method_injector/MethodInjector.java     | 125 ++++++++++++++-------
 injector/src/test/client/Main.java                 |   3 +
 injector/src/test/synthetics/A.java                |   5 +
 injector/src/test/synthetics/B.java                |   9 ++
 injector/src/test/v1/Foo.java                      |   6 +
 injector/src/test/v2/Foo.java                      |  15 +++
 pom.xml                                            |  55 +++++++--
 src/site/apt/index.apt.vm                          |   7 +-
 12 files changed, 199 insertions(+), 61 deletions(-)

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