From 32003c83ff415f754d02e9607a0b792c86a23fbc Mon Sep 17 00:00:00 2001
From: Qianqian Fang <fangqq@gmail.com>
Date: Wed, 30 Dec 2015 17:47:52 -0500
Subject: [PATCH] update jsonlab docs for version 1.2 release

---
 AUTHORS.txt   | 9 +++++++++
 ChangeLog.txt | 9 +++++++++
 README.txt    | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 9dd3fc7..f02f7a8 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -39,3 +39,12 @@ This toolbox contains patches submitted by the following contributors:
   patches for svn revision 415.
   - savejson saves an empty cell array as [] instead of null
   - loadjson differentiates an empty struct from an empty array
+
+- Mykhailo Bratukha <bratukha.m at gmail.com>
+  (Pull#14) Bug fix: File path is wrongly inerpreted as JSON string
+
+- Insik Kim <insik92 at gmail.com>
+  (Pull#12) Bug fix: Resolving bug that cell type is converted to json with transposed data
+
+- Sertan Senturk 
+  (Pull#10,#11)  Feature: Added matlab object saving to savejson and saveubjson
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2f87fcc..65016b9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -6,6 +6,15 @@
 
 JSONlab ChangeLog (key features marked by *):
 
+== JSONlab 1.2 (codename: Optimus - Update 2), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
+
+ 2015/12/16  replacing string concatenation by str cells to gain 2x speed in savejson (Issue#17)
+ 2015/12/11  fix FileName option case bug (SVN rev#495)
+ 2015/12/11  add SingletCell option, add SingletArray to replace NoRowBracket (Issue#15,#8)
+ 2015/11/10  fix bug for inerpreting file names as JSON string - by Mykhailo Bratukha (Pull#14)
+ 2015/10/16  fix bug for cell with transposed data - by Insik Kim (Pull#12)
+ 2015/09/25  support exporting matlab object to JSON - by Sertan Senturk (Pull#10, #11)
+
 == JSONlab 1.1 (codename: Optimus - Update 1), FangQ <fangq (at) nmr.mgh.harvard.edu> ==
 
  2015/05/05 *massively accelerating loadjson for parsing large collection of unstructured small objects
diff --git a/README.txt b/README.txt
index eb94c3c..f241435 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,7 @@
 
 *Copyright (C) 2011-2015  Qianqian Fang <fangq at nmr.mgh.harvard.edu>
 *License: BSD or GNU General Public License version 3 (GPL v3), see License*.txt
-*Version: 1.1 (Optimus - Update 1)
+*Version: 1.2 (Optimus - Update 2)
 
 -------------------------------------------------------------------------------
 
-- 
GitLab