fix merge conflicts with master

[ardour.git] / libs / canvas / lookup_table.cc

diff --git a/libs/canvas/lookup_table.cc b/libs/canvas/lookup_table.cc
index 8fbbbea98e0145c456fe7a76c948da91e12f7eff..be0e553ee7a44a644c3a55230b2d585613a46f1e 100644 (file)
--- a/libs/canvas/lookup_table.cc
+++ b/libs/canvas/lookup_table.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2011-2013 Paul Davis
+    Author: Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #include "canvas/lookup_table.h"
 #include "canvas/group.h"