Meik Sievertsen 189e7cdf45 - 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		2009-01-12 16:58:47 +00:00
..
diff.php	- Allow download of conflicting file for later reference in automatic updater	2009-01-12 16:58:47 +00:00
engine.php	update diff engine to Text_Diff 1.1.0	2009-01-12 16:47:58 +00:00
renderer.php	- Allow download of conflicting file for later reference in automatic updater	2009-01-12 16:58:47 +00:00