From 83f16e25e3f309d1eff31e9ac759e41198d353bd Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Wed, 22 Jan 2014 11:44:48 -0800 Subject: [PATCH] merge from develop --- build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index d28d159188..93c759b563 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -cef2fc996fdcd5cafb53c8a9afbd2002fbd5cbf6 \ No newline at end of file +e706fcdbf8b76069d794bc03e3849a57932cdf0a \ No newline at end of file