12 Commits

Author	SHA1	Message	Date
minggo	fd9f73f43e	fixed #957: avoid to go to background when inputting test	2012-02-14 16:02:41 +08:00
minggo	63679ab9f4	remove unneeded file	2012-02-10 14:35:02 +08:00
minggo	8c63344c16	merge cocos2d-x master	2011-09-28 15:32:30 +08:00
minggo	3912be7f9d	not get value of ok button from xml file	2011-09-28 15:27:31 +08:00
minggo	c24d1d3fd6	Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port	2011-09-16 13:53:18 +08:00
minggo	194f47bc54	fixed #718: get button value from string.xml & add copyright for java codes	2011-09-15 14:17:07 +08:00
Macarse	208bce312e	Replaced LinearLayout with FrameLayout	2011-09-13 20:25:07 -03:00
laschweinski	ff5222fff8	some files missiong(eclipse with git is too hard to play)	2011-08-21 19:00:26 +08:00
yangws	4d8596169e	Sync java code in Helloworld and tests.	2011-06-22 11:37:42 +08:00
minggo	a165663b4c	[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld	2011-04-12 15:37:44 +08:00
walzer	a2b426047d	[android] make HelloWorld compatible on android 2.1 simulator	2011-01-21 08:44:15 +08:00
minggo	ddaa654333	fixed #260	2010-12-18 18:23:31 +08:00