| commit | cd6c91a485461023d9447b5d9771e19a19238fd6 | [log] [tgz] |
|---|---|---|
| author | Philip Martin <philip@apache.org> | Tue Mar 25 13:57:30 2014 +0000 |
| committer | Philip Martin <philip@apache.org> | Tue Mar 25 13:57:30 2014 +0000 |
| tree | e27d14a35785d1a87a74eaa1582b92237e0b41a1 | |
| parent | 34d23ec5589e3c14df3347393976cd938a7fcecc [diff] |
On 1.8.x-r1581305 branch, merge r1581305 and 1581315 and resolve text conflict in svn_dep_compat.h. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1581305@1581326 13f79535-47bb-0310-9956-ffa450edef68