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

[James Downing Page]

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

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

commit dda5c31ddc6fded71ea1a99c77e0806e5335c099
Merge: f3ce859 6fbe0b8
Author: James Page <james.page at ubuntu.com>
Date:   Sun Dec 22 20:25:45 2013 +0000

    Merge tag 'upstream/1.8'
    
    Upstream version 1.8

 annotation/pom.xml                                 |  6 +--
 injector/pom.xml                                   | 27 +++++++-----
 .../bridge_method_injector/MethodInjector.java     | 51 ++++++++++++++--------
 injector/src/test/client/Main.java                 | 47 +++++++++++++++++---
 injector/src/test/v1/Bar.java                      |  4 ++
 injector/src/test/v1/Foo.java                      | 16 ++++++-
 injector/src/test/v1/IBar.java                     |  4 ++
 injector/src/test/v1/IFoo.java                     |  4 ++
 injector/src/test/v2/Bar.java                      |  4 ++
 injector/src/test/v2/Foo.java                      | 15 ++++++-
 injector/src/test/v2/IBar.java                     |  8 ++++
 injector/src/test/v2/IFoo.java                     |  9 ++++
 pom.xml                                            |  8 ++--
 src/site/apt/{index.apt => index.apt.vm}           | 21 +++++++--
 14 files changed, 177 insertions(+), 47 deletions(-)

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