Merge remote-tracking branch 'origin/develop' into HEAD

cocos2d · Mar 14, 2012 · 0a4f828 · 0a4f828
2 parents 5d60750 + 2d4d0b3
commit 0a4f828
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+version 1.1-beta2b 14-Mar-2012
+. [FIX] CCUtils: missing method declaration
+
 version 1.1-beta2 12-Mar-2012
 . [NEW] v2.0 forward ported changes:
 			LabelBMFont: added setFntFile method

diff --git a/cocos2d/Support/CCFileUtils.h b/cocos2d/Support/CCFileUtils.h
@@ -110,7 +110,7 @@
  Only available on iOS. Not supported on OS X.
  
  */
-+(BOOL) iPadFileExistsAtPath:(NSString*)filename;
++(BOOL) iPadRetinaDisplayFileExistsAtPath:(NSString*)filename;
 
 /** Returns whether or not a given path exists with the iPhone RetinaDisplay suffix.
  Only available on iOS. Not supported on OS X.

diff --git a/cocos2d/cocos2d.m b/cocos2d/cocos2d.m
@@ -26,7 +26,7 @@
 
 #import <Foundation/Foundation.h>
 #import "cocos2d.h"
-static NSString *version = @"cocos2d v1.1.0-beta2";
+static NSString *version = @"cocos2d v1.1.0-beta2b";
 
 NSString *cocos2dVersion()
 {