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

tests/Resources/example_Flower.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/Resources/example_Heart.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/Resources/example_Julia.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/Resources/example_Mandelbrot.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/Resources/example_Monjori.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/Resources/example_Plasma.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/Resources/example_Twist.vsh

@@ -1,10 +0,0 @@
-// http://www.cocos2d-iphone.org
-
-attribute vec4 a_position;
-
-uniform		mat4 u_MVPMatrix;
-
-void main()
-{
-    gl_Position = u_MVPMatrix * a_position;
-}

tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-eb7dd21e7b4067a99d2106e2c4713caf43cb1064
+27262a27cf46748c95185438b536e5ba4b6a7a44

tests/tests/LabelTest/LabelTest.cpp

@@ -1170,7 +1170,7 @@ void BitmapFontMultiLineAlignment::ccTouchesMoved(cocos2d::CCSet *pTouches, coco
 	this->m_pArrowsShouldRetain->setPosition(ccp(MAX(MIN(location.x, ArrowsMax*winSize.width), ArrowsMin*winSize.width), 
 		this->m_pArrowsShouldRetain->getPosition().y));
 
-	float labelWidth = abs(this->m_pArrowsShouldRetain->getPosition().x - this->m_pLabelShouldRetain->getPosition().x) * 2;
+	float labelWidth = fabs(this->m_pArrowsShouldRetain->getPosition().x - this->m_pLabelShouldRetain->getPosition().x) * 2;
 
 	this->m_pLabelShouldRetain->setWidth(labelWidth);
 }