# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1429533648 -7200
# Node ID 38b39b75500c4b6809b3094ba749f593ea6b25c6
# Parent  e121783a0df94e1763874e0ded58a2382bdfb680
Mention u40 merge in changelog

diff -r e121783a0df9 -r 38b39b75500c CHANGELOG.md
--- a/CHANGELOG.md	Mon Apr 20 14:38:58 2015 +0200
+++ b/CHANGELOG.md	Mon Apr 20 14:40:48 2015 +0200
@@ -5,10 +5,11 @@
 
 ## `tip`
 ### Graal
+* Merged with jdk8u40-b25.
 * Add utilities ModifiersProvider#isConcrete, ResolvedJavaMethod#hasBytecodes, ResolvedJavaMethod#hasReceiver to Graal API.
 * Add `GraalDirectives` API, containing methods to influence compiler behavior for unittests and microbenchmarks.
 * Introduce `LIRSuites`, an extensible configuration for the low-level compiler pipeline.
-* The Graal class loader now loads all lib/graal/graal*.jar jars
+* The Graal class loader now loads all lib/graal/graal*.jar jars.
 * ...
 
 ### Truffle