James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update ... Conflicts: cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp		2012-11-16 16:21:16 +08:00
..
Classes	issue #1555:update to v2.1 beta3	2012-11-14 18:05:15 +08:00
Resources	Tiff support and resource location	2012-11-14 17:46:09 +00:00
proj.android	set -x in build script so that entire command line is available in the build log	2012-10-01 11:58:46 -07:00
proj.blackberry	Resource file searching implementation for blackberry.	2012-08-27 13:48:17 +08:00
proj.ios	issue #1486: Added iPad, ipadhd resources, and make some watermark for these pictures.	2012-10-11 18:33:43 +08:00
proj.linux	fix compiling error on linux 64 bit	2012-11-01 15:38:48 +08:00
proj.mac	fixed #1515: implement zoom function on mac os	2012-10-19 11:33:06 +08:00
proj.marmalade	Tiff support and resource location	2012-11-14 17:46:09 +00:00
proj.win32	fixed #1520: Added comments for using multiresolution in HelloCpp.	2012-10-23 10:50:47 +08:00