# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1307531205 -7200
# Node ID 693e4e92346b912db24d9ebe4f5ba5eb6fbda75f
# Parent  adfc15cbcabcbca1b5bf55a4b9a77a57a577d7f1# Parent  971b7dcf64dc1e883ce4ad7b8a4e0bcf3555eb9d
merge

diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatDiv.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatMul.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatRem.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatSub.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAdd.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerDiv.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerMul.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerRem.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerSub.java
diff -r 971b7dcf64dc -r 693e4e92346b graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java	Wed Jun 08 12:07:49 2011 +0200
+++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java	Wed Jun 08 13:06:45 2011 +0200
@@ -44,7 +44,7 @@
     private Node self() {
         return this.node;
     }
-    
+
     Node silentSet(int index, Node node) {
         Node result = nodes[index];
         nodes[index] = node;
@@ -113,7 +113,7 @@
         }
         return false;
     }
-    
+
     public int remove(Node n) {
         return replace(n, null);
     }