From 507d8b03851f6aa429766a6e0dd3b2926dc8e5e7 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 12 Jan 2009 16:47:58 +0000 Subject: update diff engine to Text_Diff 1.1.0 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9251 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/diff/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/diff/renderer.php') diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 2e0ec86e75..02fb6ccc37 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -17,7 +17,7 @@ if (!defined('IN_PHPBB')) } /** -* Code from pear.php.net, Text_Diff-1.0.0 package +* Code from pear.php.net, Text_Diff-1.1.0 package * http://pear.php.net/package/Text_Diff/ * * Modified by phpBB Group to meet our coding standards -- cgit v1.2.1 From 189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 12 Jan 2009 16:58:47 +0000 Subject: - Allow download of conflicting file for later reference in automatic updater - Default difference view is now 'inline' instead of 'side by side' - Added new option for merging differences to conflicting files in automatic updater git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9252 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/diff/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/diff/renderer.php') diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 02fb6ccc37..9144e0ab82 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -857,4 +857,4 @@ class diff_renderer_side_by_side extends diff_renderer } -?> \ No newline at end of file +?> -- cgit v1.2.1 From fce20fd8988d83e27e76ea057c25d189347df400 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 13 Jan 2009 10:55:04 +0000 Subject: TortoiseMerge seems to mess up the newlines... very very annoying bug. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9254 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/diff/renderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/diff/renderer.php') diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index 9144e0ab82..02fb6ccc37 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -857,4 +857,4 @@ class diff_renderer_side_by_side extends diff_renderer } -?> +?> \ No newline at end of file -- cgit v1.2.1