zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb ... Conflicts: build/cocos2d-wp8.sln		2015-04-16 17:04:07 +08:00
..
.settings	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
res	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
src	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb	2015-04-16 17:04:07 +08:00
.classpath	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
.project	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
AndroidManifest.xml	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
ant.properties	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
build.xml	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
lint.xml	issue #4895:Get events from controller to engine[android]	2014-06-30 03:20:22 +08:00
proguard-project.txt	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
project.properties	Android properties back to 10	2014-09-09 18:46:47 -07:00