Merge release3_0_apl, changing the license in the 3.1.x release branch

1 files changed, 15 insertions, 1 deletions

diff --git a/xdelta3/testing/delta.h b/xdelta3/testing/delta.h
index deac217..bd38c6c 100644
--- a/xdelta3/testing/delta.h
+++ b/xdelta3/testing/delta.h
@@ -1,4 +1,18 @@
-// Mode: -*- C++ -*-
+/* xdelta3 - delta compression tools and library -*- Mode: C++ -*-
+   Copyright 2016 Joshua MacDonald
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
 
 class Delta {
 public: