From ca1448765160a8e93dc17d14273da7733b906904 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 7 Mar 2013 09:30:37 -0800 Subject: [PATCH] Upgrade to Chipmunk v6.1.4 --- CHANGELOG | 3 ++- external/Chipmunk | 2 +- tests/cocos2d-js-tests | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c20b84165c5..6e2d218c437 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,8 +11,9 @@ version 2.1-rc1 - XX-Mar-2013 . [FIX] Texture2D: Logs using RGB565 textures only if RGB565 is being used Fixed deprecation warnings on iOS6 (issue #1467) . [PERF] Uniforms: small performance improvement when setting uniforms -. [3RD] JS Bindings: Updated to v0.6 . [3RD] CCBReader: new version of CCBReader (which version is it???) +. [3RD] Chipmunk: Updated to 6.1.4 +. [3RD] JS Bindings: Updated to v0.6 . [3RD] SpiderMonkey: Updated to v19.0 version 2.1-rc0a 07-Feb-2013 diff --git a/external/Chipmunk b/external/Chipmunk index 14b5a4f5185..e9cf7dc1f30 160000 --- a/external/Chipmunk +++ b/external/Chipmunk @@ -1 +1 @@ -Subproject commit 14b5a4f5185295258ee9bdfa13a6a42f9b3a1943 +Subproject commit e9cf7dc1f302cb896fc46a18443a1a6f00337370 diff --git a/tests/cocos2d-js-tests b/tests/cocos2d-js-tests index 55869f7add9..4274cd1db48 160000 --- a/tests/cocos2d-js-tests +++ b/tests/cocos2d-js-tests @@ -1 +1 @@ -Subproject commit 55869f7add95ff1a6c0ff5053ba4b3a9a683c172 +Subproject commit 4274cd1db484d0bc35c8fe2cbf28068834d5395f