From e716ddc9a0bf1e6be092ec0c09b5e25d3f1695c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 29 Mar 2011 21:50:38 +0200 Subject: [PATCH] Updates ChangeLog. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- ChangeLog | 4 ++++ core | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 -- 2.1.4