projects / shibboleth / xmltooling.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 429c876 d536883)
Merge branch 'upstream' into bug/ostream
authorRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:47:17 +0000 (17:47 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 24 Aug 2008 00:47:17 +0000 (17:47 -0700)
Conflicts:

xmltooling/soap/impl/SOAPClient.cpp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.