# HG changeset patch
# User Michael Van De Vanter  <michael.van.de.vanter@oracle.com>
# Date 1395085235 25200
# Node ID 24431a9b878cee8bbc68eba583ef623e5c485e97
# Parent  c828417b7037eebf2e4edb3987016464578c9878# Parent  5e04917e66165ef93fe7b61030c4d89a08b3d53c
Merge with 5e04917e66165ef93fe7b61030c4d89a08b3d53c

diff -r 5e04917e6616 -r 24431a9b878c graal/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/KillException.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/KillException.java	Mon Mar 17 18:46:39 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/KillException.java	Mon Mar 17 12:40:35 2014 -0700
@@ -26,7 +26,6 @@
 
 import com.oracle.truffle.api.nodes.*;
 
-// TODO (mlvdv) does this need to extend ControlFlowException?  It was originally part of the Ruby Shell.
 /**
  * Controls breaking out of an execution context, such as a shell or eval.
  */
diff -r 5e04917e6616 -r 24431a9b878c graal/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/QuitException.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/QuitException.java	Mon Mar 17 18:46:39 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/QuitException.java	Mon Mar 17 12:40:35 2014 -0700
@@ -26,7 +26,6 @@
 
 import com.oracle.truffle.api.nodes.*;
 
-//TODO (mlvdv) does this need to extend ControlFlowException?  It was originally part of the Ruby execution environment.
 /**
  * Controls breaking out of all executions and ending Truffle execution.
  */