merged in master and stable-2.6, thanks!
Mathieu
- On Jun 25, 2015, at 7:10 PM, Michael Jeanson mjean...@efficios.com wrote:
> Signed-off-by: Michael Jeanson
> ---
> liblttng-ust-java-agent/jni/jul/Makefile.am | 2 +-
> liblttng-ust-java-agent/jni/log4j/Makefile.am | 2 +-
> 2 files changed
Signed-off-by: Michael Jeanson
---
liblttng-ust-java-agent/jni/jul/Makefile.am | 2 +-
liblttng-ust-java-agent/jni/log4j/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am
b/liblttng-ust-java-agent/jni/jul/Makefile.am