# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1436393937 -7200
# Node ID 2378eaca447aa50b451610036d45b47765145601
# Parent  42ee3b572280f89aaad8b9b05a0bf9262014afee# Parent  a19ed9118dc45fb312870591779ddee461ca6695
Merge.

diff -r 42ee3b572280 -r 2378eaca447a .hgignore
--- a/.hgignore	Thu Jul 09 00:11:05 2015 +0200
+++ b/.hgignore	Thu Jul 09 00:18:57 2015 +0200
@@ -6,6 +6,7 @@
 ^jdk1.(7|8).0
 ^java64/
 ^work/
+^mx.imports/
 \.checkstyle$
 \.classpath
 \.factorypath
diff -r 42ee3b572280 -r 2378eaca447a mx.graal/suite.py
--- a/mx.graal/suite.py	Thu Jul 09 00:11:05 2015 +0200
+++ b/mx.graal/suite.py	Thu Jul 09 00:18:57 2015 +0200
@@ -13,11 +13,11 @@
             },
             {
                "name" : "truffle",
-               "version" : "6efd3e3389adfcc1f43e07be8f0aae2cb8cd5499",
+               "version" : "f878f9778548f684c6f8b88e1bb7d3b49d40ce4c",
                "urls" : [
                     {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/truffle-mx2", "kind" : "hg"},
                     # Disable reference to snapshots until they are built from truffle-mx2 or truffle-mx2 is renamed to truffle
-                    #{"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary", "version-adjust" : "0.8-{version}-SNAPSHOT"},
+                    #{"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},
                 ]
             },
     ]
@@ -782,6 +782,7 @@
         "com.oracle.graal.compiler.test",
         "truffle:TRUFFLE_SL",
       ],
+      "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
       "workingSets" : "Graal,Truffle,Test",