Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

[libdcp.git] / src / object.h

diff --git a/src/object.h b/src/object.h
index 5c5bbc0e4cab5a7383f9653cf5a9ca49f408ce03..31fb52751add9b5e73748efc823238298bbbc70f 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/object.h