Permalink
Browse files

Merge git_v1.7.10.2:vcs-svn into master

Conflicts:
	vcs-svn/fast_export.c
	vcs-svn/fast_export.h
	vcs-svn/line_buffer.c
	vcs-svn/line_buffer.h
	vcs-svn/line_buffer.txt
	vcs-svn/repo_tree.c
	vcs-svn/repo_tree.h
	vcs-svn/sliding_window.c
	vcs-svn/sliding_window.h
	vcs-svn/svndiff.c
	vcs-svn/svndiff.h
	vcs-svn/svndump.c
	vcs-svn/svndump.h
  • Loading branch information...
2 parents 152aa66 + ac4a0e0 commit 800c0573dbb5f6eff1c6e89ffe1b1a9d07f315a6 @barrbrain committed May 17, 2012
View
@@ -6,13 +6,10 @@ HEADERS = compat/mkgmtime.h \
vcs-svn/compat-util.h \
vcs-svn/fast_export.h \
vcs-svn/line_buffer.h \
- vcs-svn/obj_pool.h \
vcs-svn/repo_tree.h \
vcs-svn/sliding_window.h \
- vcs-svn/string_pool.h \
vcs-svn/svndiff.h \
- vcs-svn/svndump.h \
- vcs-svn/trp.h
+ vcs-svn/svndump.h
OBJECTS = compat/mkgmtime.o \
compat/quote.o \
@@ -22,7 +19,6 @@ OBJECTS = compat/mkgmtime.o \
vcs-svn/line_buffer.o \
vcs-svn/repo_tree.o \
vcs-svn/sliding_window.o \
- vcs-svn/string_pool.o \
vcs-svn/svndiff.o \
vcs-svn/svndump.o
View
@@ -0,0 +1,32 @@
+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
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice(s), this list of conditions and the following disclaimer
+ unmodified other than the allowable addition of one or more
+ copyright notices.
+2. Redistributions in binary form must reproduce the above copyright
+ notice(s), this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Oops, something went wrong.

0 comments on commit 800c057

Please sign in to comment.