5 Commits

Author	SHA1	Message	Date
James Chen	3bdfb82e9c	Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox ... Conflicts: samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters	2013-01-30 22:31:19 +08:00
James Chen	c0d568da9b	fixed #1639: Added custom property support for CCBReader.	2013-01-21 18:37:17 +08:00
Jozef Prídavok	9889b4f9fd	Added the very first implementation of CCEditBox for Win32.	2013-01-10 23:59:21 +01:00
Jozef Prídavok	229ad55dfa	Fixed and refactored Mac Implementation.	2013-01-09 15:34:53 +01:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00