3 Commits

Author	SHA1	Message	Date
Michael Sotnikov	b430353cd8	Fixed: #12097 VideoPlayer on Android ignores search paths	2015-05-29 10:17:40 +03:00
huangshiwu	d9634057ab	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk	2014-09-11 16:41:54 +08:00
Ricardo Quesada	9082ca18c3	Platform fixed	2014-09-09 16:50:02 -07:00