merged 1.1 branch into head

[mir.git] / source / mir / generator / tal / template / CompositeTemplateNode.java

diff --git a/source/mir/generator/tal/template/CompositeTemplateNode.java b/source/mir/generator/tal/template/CompositeTemplateNode.java
index 55a6cb0..49e245c 100755 (executable)
--- a/source/mir/generator/tal/template/CompositeTemplateNode.java
+++ b/source/mir/generator/tal/template/CompositeTemplateNode.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (C) 2001, 2002 The Mir-coders group\r
+ * Copyright (C) 2005 The Mir-coders group\r
  *\r
  * This file is part of Mir.\r
  *\r
@@ -18,12 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
  *\r
  * In addition, as a special exception, The Mir-coders gives permission to link\r
- * the code of this program with  any library licensed under the Apache Software License,\r
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library\r
- * (or with modified versions of the above that use the same license as the above),\r
- * and distribute linked combinations including the two.  You must obey the\r
- * GNU General Public License in all respects for all of the code used other than\r
- * the above mentioned libraries.  If you modify this file, you may extend this\r
+ * the code of this program with  any library licensed under the Apache Software License.\r
+ * You must obey the GNU General Public License in all respects for all of the code used\r
+ * other than the above mentioned libraries.  If you modify this file, you may extend this\r
  * exception to your version of the file, but you are not obligated to do so.\r
  * If you do not wish to do so, delete this exception statement from your version.\r
  */\r