summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-06-19 14:53:29 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-06-19 14:53:29 +0000
commit7e4c859715e60572f391c781944c901ce45db42c (patch)
tree59fd4dc2c807946a5fa51cfd8a733d8849aefb0f /qpid/cpp
parent8c8ee073330c02ba451a7a1a57e7da7110e4d8c0 (diff)
downloadqpid-python-7e4c859715e60572f391c781944c901ce45db42c.tar.gz
Fixed outstanding merge issues and updates to trunk code that were required for sl4j.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@548753 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
0 files changed, 0 insertions, 0 deletions