Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20

samples/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-35ee36aee350134dbe3d44c7a91b309972ea00ad
+bbbb2450a8de63794b1d5e2b00341086f5aee574

scripting/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id

@@ -1 +1 @@
-dab2e1ed075027aac1e137daaa68542dfe2d7c63
+57601a5ee61c442f04b4d1bbfd2697330dfc63cb

tools/tolua++/CCAction.pkg

@@ -16,25 +16,25 @@ class CCAction : public CCObject
 	CCObject* copyWithZone(CCZone* pZone);
 };
 
-class CCActionInterval : public CCAction
-{
-    float getElapsed(void);
-	bool isDone(void);
-    void setAmplitudeRate(float amp);
-    float getAmplitudeRate(void);
-	CCObject* copyWithZone(CCZone* pZone);
-	CCActionInterval* reverse(void);
-
-	CCActionInterval* create(float d);
-};
-
-class CCFiniteTimeAction : public CCActionInterval
+class CCFiniteTimeAction : public CCAction
 {
     float getDuration(void);
     void setDuration(float duration);
     CCFiniteTimeAction* reverse(void);
 };
 
+class CCActionInterval : public CCFiniteTimeAction
+{
+    float getElapsed(void);
+    bool isDone(void);
+    void setAmplitudeRate(float amp);
+    float getAmplitudeRate(void);
+    CCObject* copyWithZone(CCZone* pZone);
+    CCActionInterval* reverse(void);
+
+    CCActionInterval* create(float d);
+};
+
 // CCActionInterval
 class CCSpeed : public CCAction
 {

tools/tolua++/CCApplication.pkg

@@ -10,8 +10,20 @@ typedef enum LanguageType
     kLanguageRussian
 } ccLanguageType;
 
+enum TargetPlatform
+{
+    kTargetWindows,
+    kTargetLinux,
+    kTargetMacOS,
+    kTargetAndroid,
+    kTargetIphone,
+    kTargetIpad,
+    kTargetBlackBerry,
+};
+
 class CCApplication
 {
     static CCApplication* sharedApplication();
     ccLanguageType getCurrentLanguage();
+    TargetPlatform getTargetPlatform();
 };