From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 29 Mar 2011 19:50:38 +0000 (+0200)
Subject: Updates ChangeLog.
X-Git-Tag: xorg/1.1.1~134
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e716ddc9a0bf1e6be092ec0c09b5e25d3f1695c1;p=platal.git

Updates ChangeLog.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/ChangeLog b/ChangeLog
index 5506f14..5fd4551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 ================================================================================
 VERSION 1.1.1                                                         XX XX XXXX
 
+From 1.1.0 branch:
+
+    * Search:
+        - #1449: Load json2 on IE because IE<=7 do not implement JSON      -FRU
 
 ================================================================================
 VERSION 1.1.0                                                         26 03 2011
diff --git a/core b/core
index 23947d1..8dd67de 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 23947d18803b48cc6c235cdd3c304ca52fd6763c
+Subproject commit 8dd67de33d8b729b3ff0f5aae6de1dbad9f3f30d