CyberLeo.Net >> Repos - SourceForge/phpwiki.git/history - lib/diff3.php

]> CyberLeo.Net >> Repos - SourceForge/phpwiki.git/history - lib/diff3.php

projects / SourceForge / phpwiki.git / history

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

[SourceForge/phpwiki.git] / lib / diff3.php

2013-05-29	vargenau	var --> public	blob \| commitdiff \| raw
2012-10-11	vargenau	Remove extra white lines	blob \| commitdiff \| raw \| diff to current
2012-10-11	vargenau	Remove useless semicolon	blob \| commitdiff \| raw \| diff to current
2012-10-06	vargenau	Reformat code	blob \| commitdiff \| raw \| diff to current
2012-09-28	vargenau	include [all] Include and file path should be devided...	blob \| commitdiff \| raw \| diff to current
2012-09-28	vargenau	php_closing_tag [PSR-2] The closing ?> tag MUST be...	blob \| commitdiff \| raw \| diff to current
2012-08-31	vargenau	extra_empty_lines	blob \| commitdiff \| raw \| diff to current
2011-03-05	vargenau	No tabs	blob \| commitdiff \| raw \| diff to current
2011-03-03	vargenau	Remove rcs_id	blob \| commitdiff \| raw \| diff to current
2010-05-19	vargenau	rcs_id no longer makes sense with Subversion global...	blob \| commitdiff \| raw \| diff to current
2008-08-22	vargenau	Activated Id substitution for Subversion	blob \| commitdiff \| raw \| diff to current
2002-08-20	rurban	fixed Conflicting Edits Bug from http://phpwiki.sourc...	blob \| commitdiff \| raw \| diff to current
2002-02-15	lakka	MergeConflictingEdits done. The merge is automatic...	blob \| commitdiff \| raw \| diff to current
2002-02-14	lakka	Did it properly this time	blob \| commitdiff \| raw \| diff to current
2002-02-14	lakka	Corrected a typo and removed some stray debugging code	blob \| commitdiff \| raw \| diff to current
2001-12-16	dairiki	Added three-way diff engine. (Beginning of support for	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.