diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-12 16:58:47 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-12 16:58:47 +0000 |
| commit | 189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391 (patch) | |
| tree | 928bd59f2380baa077a8684a80cdfd94bbf5b1b0 /phpBB/includes/diff/renderer.php | |
| parent | 507d8b03851f6aa429766a6e0dd3b2926dc8e5e7 (diff) | |
| download | forums-189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391.tar forums-189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391.tar.gz forums-189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391.tar.bz2 forums-189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391.tar.xz forums-189e7cdf45feb3f146ce059e5c2bcc6ccd0a7391.zip | |
- 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
Diffstat (limited to 'phpBB/includes/diff/renderer.php')
| -rw-r--r-- | phpBB/includes/diff/renderer.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 +?> |