summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greig <rgreig@apache.org>2006-11-23 23:21:23 +0000
committerRobert Greig <rgreig@apache.org>2006-11-23 23:21:23 +0000
commit21028ac0c8681af9a5c1b88a2aa8e2aac951d2ab (patch)
tree9b03ccb0f01d2347e4610c63531121c973cb80ec
parentdbe4a93b83a193f4903b22692a89e2ca9959d337 (diff)
downloadqpid-python-21028ac0c8681af9a5c1b88a2aa8e2aac951d2ab.tar.gz
Start of merge from trunk - some manual restructuring
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/new_persistence@478709 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert (renamed from java/common/resources/org/apache/qpid/ssl/qpid.cert)bin756 -> 756 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/java/common/resources/org/apache/qpid/ssl/qpid.cert b/java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert
index e6702108e6..e6702108e6 100644
--- a/java/common/resources/org/apache/qpid/ssl/qpid.cert
+++ b/java/common/src/main/resources/org/apache/qpid/ssl/qpid.cert
Binary files differ