Merge branch 'branch3.1'

jjakub · Aug 28, 2011 · 5f73181 · 5f73181
2 parents ddf55a4 + 33dfa6e
commit 5f73181
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,12 @@
 # JSON Framework Changes
 
+## Version 3.1alpha2 (August 28th, 2011)
+
+* Revert fix to [Issue 83][#83]. People are already using the low-level protocol.
+* [Issue 88][#88]: Fix parsing of -0 into the integer 0.
+* [Issue 86][#86]: Make framework compile on Leopard.
+* [Issue 91][#91]: Fix leak of error string in certain situations.
+
 ## Version 3.1alpha1 (July 30th, 2011)
 
 * [Issue 9][#9]: Improve writing speed in samsoffes' benchmark.

diff --git a/SBJson.xcodeproj/project.pbxproj b/SBJson.xcodeproj/project.pbxproj
@@ -730,9 +730,9 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 33;
+				DYLIB_CURRENT_VERSION = 34;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -752,10 +752,10 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 33;
+				DYLIB_CURRENT_VERSION = 34;
 				FRAMEWORK_VERSION = A;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_ENABLE_OBJC_GC = supported;

diff --git a/SBJson/SBJson-Info.plist b/SBJson/SBJson-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1</string>
+	<string>3.1alpha2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/SBJsonTests/SBJsonTests-Info.plist b/SBJsonTests/SBJsonTests-Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1</string>
+	<string>3.1alpha2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/sbjson-iosTests/sbjson-iosTests-Info.plist b/sbjson-iosTests/sbjson-iosTests-Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1</string>
+	<string>3.1alpha2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>