Merged revisions 6293,6296-6306,6308 via svnmerge from

[ardour.git] / libs / glibmm2 / glib / glibmm / streamiochannel.h

diff --git a/libs/glibmm2/glib/glibmm/streamiochannel.h b/libs/glibmm2/glib/glibmm/streamiochannel.h
index 39f0d340c7b06686d2e364aee27fde19445f0108..65c69725986537c7b236da3597ca4f2e5896f816 100644 (file)
--- a/libs/glibmm2/glib/glibmm/streamiochannel.h
+++ b/libs/glibmm2/glib/glibmm/streamiochannel.h
@@ -1,19 +1,19 @@
 // -*- c++ -*-
-/* $Id: streamiochannel.h 779 2009-01-19 17:58:50Z murrayc $ */
+/* $Id: streamiochannel.h 17 2003-01-22 12:09:02Z murrayc $ */
 
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
+ * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) any later version.
  *
  * This library 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
- * Lesser General Public License for more details.
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */