summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-merge.h
AgeCommit message (Expand)Author
2016-04-02Merge release3_0_apl, changing the license in the 3.1.x release branchJosh MacDonald
2016-03-14Introduce APL LICENSE and notices, remove GNU COPYING and notices. Version 3....Josh MacDonald
2016-01-04Build fixes w/ XD3_DEBUG=9 and Clang -WeverythingJosh MacDonald
2015-11-10Merge command comments; VCD_TARGET cleanupJosh MacDonald
2015-03-06Builds clean Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn)Joshua MacDonald
2010-08-01Fixes for win7, especially named pipe handlingjosh.macdonald@gmail.com
2008-09-13Implement adler32 and appheader for merge command.josh.macdonald
2008-09-07Fixes two merge bugs:josh.macdonald
2008-09-06Fixes an incorrect mode assignment for merging source-copies of josh.macdonald
2008-09-05Solves the issue reported in Issue 36. More merge tests now pass.josh.macdonald
2008-08-16Fixes a error in the test. Merge test passes...???josh.macdonald
2008-08-16Fix bug in xd3_merge_add(), calling memcpy with wrong offset and size.josh.macdonald
2008-07-07Make these files compile with C++.josh.macdonald
2008-04-22First successful merge command. :)josh.macdonald
2008-04-20No, doesn't work but this is a little closer. The bug-fix for thejosh.macdonald
2008-04-20It's plausible that this merge code actually works; untested.josh.macdonald
2008-04-19Cleanup of previous. New xd3_merge_input_output used in bothjosh.macdonald
2008-04-19Straighten up the logic for calling xd3_merge_inputs in both josh.macdonald
2008-04-15Fixes for issue 70. The test inputs tickled a case where thejosh.macdonald
2008-04-09Add mechanism for processing merge arguments in order, memoryjosh.macdonald
2008-04-02Merge command passes its first smoke test, reproduces a delta byjosh.macdonald
2007-12-27Adding more support for "merge" command.josh.macdonald
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 14:38:11 +0000