projects / shibboleth / xmltooling.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 746fbc3 dfbfdda)
Merge commit 'upstream/1.2'
authorRuss Allbery <rra@debian.org>
Wed, 5 Aug 2009 22:36:21 +0000 (15:36 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 5 Aug 2009 22:36:21 +0000 (15:36 -0700)
commitf4a3c8f392f622d8cedc8966467a75e2a8a4863b
tree0d9771077edde06d7c13851a89d0b74deef4ef4ftree | snapshot
parent746fbc3f424dbd813dbf7ca3757734029fe295b6commit | diff
parentdfbfdda7855878816f93c4d93b5398a302c2021bcommit | diff
Merge commit 'upstream/1.2'

Conflicts:
xmltooling/base.h
Unnamed repository; edit this file 'description' to name the repository.