[commits] Horde branch master updated. 01b46f51b977102102d6b45d7312e31f8856d4ad

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 796e0462d80b5adc7fb7b66c5a780c572de19ec4

86b0418 Add test for Horde_Text_Diff_ThreeWay which is actually 3-way-merge (Bug #10548).
01b46f5 Fix class names (Bug #10548).

-----------------------------------------------------------------------

commit 86b0418a3124618d22cf55cb70b7df2b95ffdfba
Author: Jan Schneider <jan at horde.org>
Date:   Tue Oct 11 17:54:31 2011 +0200

    Add test for Horde_Text_Diff_ThreeWay which is actually 3-way-merge (Bug #10548).

 framework/Text_Diff/package.xml                           |   10 ++-
 framework/Text_Diff/test/Horde/Text/Diff/ThreeWayTest.php |   51 +++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 framework/Text_Diff/test/Horde/Text/Diff/ThreeWayTest.php

http://git.horde.org/horde-git/-/commit/86b0418a3124618d22cf55cb70b7df2b95ffdfba

-----------------------------------------------------------------------

commit 01b46f51b977102102d6b45d7312e31f8856d4ad
Author: Jan Schneider <jan at horde.org>
Date:   Tue Oct 11 17:56:25 2011 +0200

    Fix class names (Bug #10548).

 framework/Text_Diff/lib/Horde/Text/Diff/ThreeWay.php              |    4 ++--
 framework/Text_Diff/lib/Horde/Text/Diff/ThreeWay/BlockBuilder.php |    2 +-
 framework/Text_Diff/package.xml                                   |    4 ++--
 framework/Text_Diff/test/Horde/Text/Diff/RendererTest.php         |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/01b46f51b977102102d6b45d7312e31f8856d4ad