diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-06-15 02:17:51 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-06-15 02:17:51 -0500 |
| commit | a8d3d265450d8fc2c14a4bcd2f16d28d4ea0196b (patch) | |
| tree | 5e83d8ad5fceb4e934838da21478adf90d5c5653 /vcs-svn/LICENSE | |
| parent | c19d653c4fcdc93169507c09f8f66ebffbdbb9a5 (diff) | |
| parent | fbdd4f6fb477885e4bf81658e02c3542a861c695 (diff) | |
| download | git-a8d3d265450d8fc2c14a4bcd2f16d28d4ea0196b.tar.gz | |
Merge branch 'db/delta-applier' into svn-fe
* db/delta-applier:
vcs-svn: cap number of bytes read from sliding view
test-svn-fe: split off "test-svn-fe -d" into a separate function
vcs-svn: let deltas use data from preimage
vcs-svn: let deltas use data from postimage
vcs-svn: verify that deltas consume all inline data
vcs-svn: implement copyfrom_data delta instruction
vcs-svn: read instructions from deltas
vcs-svn: read inline data from deltas
vcs-svn: read the preimage when applying deltas
vcs-svn: parse svndiff0 window header
vcs-svn: skeleton of an svn delta parser
vcs-svn: make buffer_read_binary API more convenient
vcs-svn: learn to maintain a sliding view of a file
Makefile: list one vcs-svn/xdiff object or header per line
Conflicts:
Makefile
vcs-svn/LICENSE
Diffstat (limited to 'vcs-svn/LICENSE')
| -rw-r--r-- | vcs-svn/LICENSE | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcs-svn/LICENSE b/vcs-svn/LICENSE index 533f585ebf..eb91858b82 100644 --- a/vcs-svn/LICENSE +++ b/vcs-svn/LICENSE @@ -1,6 +1,8 @@ Copyright (C) 2010 David Barr <david.barr@cordelta.com>. All rights reserved. +Copyright (C) 2010 Jonathan Nieder <jrnieder@gmail.com>. + Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH, Frankfurt/Main, Germany and others, see http://svn2cc.sarovar.org |