Merge branch 'develop' into headless-develop

osinoleg · osinoleg · commit 3ada1898182d · 2014-08-12T16:08:33.000-07:00
Conflicts:
	cocos2d-ios.xcodeproj/project.pbxproj
	cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
	cocos2d-ui/CCScrollView.m
	cocos2d/Platforms/CCDirectorView.h
diff --git a/cocos2d-tests-android/Headless.xcodeproj/project.pbxproj b/cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
@@ -1044,8 +1044,8 @@
 				OTHER_LDFLAGS = (
 					"-landroid",
 					"-lgles_apportable",
-					"-ObjC",
 					"-all_load",
+					"-ObjC",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
diff --git a/cocos2d-ui/CCScrollView.m b/cocos2d-ui/CCScrollView.m
@@ -775,6 +775,7 @@ - (void) onExitTransitionDidStart
     [recognizers removeObject:_tapRecognizer];
     
     view.gestureRecognizers = recognizers;
+    
     [super onExitTransitionDidStart];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -775,6 +775,7 @@ - (void) onExitTransitionDidStart`
`775`	`775`	`[recognizers removeObject:_tapRecognizer];`
`776`	`776`
`777`	`777`	`view.gestureRecognizers = recognizers;`
	`778`	`+`
`778`	`779`	`[super onExitTransitionDidStart];`
`779`	`780`	`}`
`780`	`781`