From 80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Mon, 6 Dec 2010 16:05:46 +0000 Subject: Attempt one at merge from r1021441:HEAD git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/lib/slf4j-api-1.4.0.jar | Bin 13095 -> 0 bytes qpid/java/lib/slf4j-api-1.6.1.jar | Bin 0 -> 25496 bytes qpid/java/lib/slf4j-log4j12-1.4.0.jar | Bin 7132 -> 0 bytes qpid/java/lib/slf4j-log4j12-1.6.1.jar | Bin 0 -> 9753 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 qpid/java/lib/slf4j-api-1.4.0.jar create mode 100644 qpid/java/lib/slf4j-api-1.6.1.jar delete mode 100644 qpid/java/lib/slf4j-log4j12-1.4.0.jar create mode 100644 qpid/java/lib/slf4j-log4j12-1.6.1.jar (limited to 'qpid/java/lib') diff --git a/qpid/java/lib/slf4j-api-1.4.0.jar b/qpid/java/lib/slf4j-api-1.4.0.jar deleted file mode 100644 index 9ce2532aa4..0000000000 Binary files a/qpid/java/lib/slf4j-api-1.4.0.jar and /dev/null differ diff --git a/qpid/java/lib/slf4j-api-1.6.1.jar b/qpid/java/lib/slf4j-api-1.6.1.jar new file mode 100644 index 0000000000..42e0ad0de7 Binary files /dev/null and b/qpid/java/lib/slf4j-api-1.6.1.jar differ diff --git a/qpid/java/lib/slf4j-log4j12-1.4.0.jar b/qpid/java/lib/slf4j-log4j12-1.4.0.jar deleted file mode 100644 index e8e09f35ca..0000000000 Binary files a/qpid/java/lib/slf4j-log4j12-1.4.0.jar and /dev/null differ diff --git a/qpid/java/lib/slf4j-log4j12-1.6.1.jar b/qpid/java/lib/slf4j-log4j12-1.6.1.jar new file mode 100644 index 0000000000..873d11983e Binary files /dev/null and b/qpid/java/lib/slf4j-log4j12-1.6.1.jar differ -- cgit v1.2.1