diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-07 22:00:09 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-07 22:00:09 +0000 |
| commit | 5c0340d79966f52bcb5ff180a96b576f450cbca6 (patch) | |
| tree | 8aa062eb6f722bbe04a474b07aa086f37a9914bd /configure.ac | |
| parent | 440687c9d13a28b902bd9594f88eea6f42be686e (diff) | |
| parent | 7970f9d6c64a6f32bd92d1b1739b44df8ff8a1ea (diff) | |
Pull tk674 changes from trunk. Required manual conflict resolution
because of tree changes in this (tk685) branch; with luck the
subversion mergeinfo will record what happened as I intended, but if
something horrible happens when this is merged back to trunk, you'll
know why. Manual diff of affected files against trunk looks good.
svn path=/branches/tk685/; revision=5766
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions