Filter conflicting changes (deleted + added at the same time)

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / scenegraph / G3DparentNode.java

diff --git a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DparentNode.java b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DparentNode.java
index 8e5cc81b4f2cf9d455ee36d679f96da91a3c41d9..ee35bac573027f22e875baa19fe0e83fb306c1fe 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DparentNode.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scenegraph/G3DparentNode.java
@@ -1,3 +1,14 @@
+/*******************************************************************************\r
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in\r
+ * Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
 package org.simantics.g3d.scenegraph;\r
 \r
 import javax.vecmath.Quat4d;\r