5 Commits

Author	SHA1	Message	Date
minggo	6abe6fce78	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
minggo	15096b0716	issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated	2013-07-12 14:30:26 +08:00
James Chen	2c1b26acf8	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00