fix merge conflicts from master

[ardour.git] / libs / audiographer / src / debug_utils.cc

diff --git a/libs/audiographer/src/debug_utils.cc b/libs/audiographer/src/debug_utils.cc
index 352c549f06ce93d0538cd4df4ab1eadc3c4964f8..3f58b33a272b1ea61ecdf4e76c0911c4333322c2 100644 (file)
--- a/libs/audiographer/src/debug_utils.cc
+++ b/libs/audiographer/src/debug_utils.cc
@@ -1,3 +1,23 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+    Author: Sakari Bergen
+
+    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 "audiographer/debug_utils.h"
 
 #include "audiographer/process_context.h"
@@ -23,4 +43,4 @@ DebugUtils::process_context_flag_name (FlagField::Flag flag)
        return ret.str();
 }
 
-} // namespace
\ No newline at end of file
+} // namespace