7 Commits

Author	SHA1	Message	Date
James Chen	b818c0afa6	fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.	2012-06-20 11:48:31 +08:00
minggo	2666df9472	issue #1269:mrege latest code and fix conflict	2012-06-19 13:57:33 +08:00
James Chen	c1883c1237	fixed #1334: Updated CCScrollView.h	2012-06-19 10:55:52 +08:00
James Chen	da85a36cd1	Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi ... Conflicts: cocos2dx/extensions/CCScrollView/CCScrollView.h	2012-06-19 10:51:40 +08:00
James Chen	9fa74721a7	fixed #1334: Add ScrollViewTest to CocosBuilderTest.	2012-06-19 10:34:15 +08:00
Nicolas Gramlich	ac4a56a38c	Fixed CCScrollView (since it was behaving differently compared to the cocos2d-iphone version).	2012-06-18 18:43:53 -07:00
James Chen	85ff705415	fixed #1333: added CCScrollView to extension.	2012-06-18 18:30:07 +08:00