5 Commits

Author	SHA1	Message	Date
Nicolas Gramlich	58b53be708	Merge with gles20.	2012-06-11 11:50:32 -07:00
Nicolas Gramlich	4378731418	Merge with gles20.	2012-06-11 10:43:07 -07:00
James Chen	fd2d9a8aa6	issue #1310: Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'.	2012-06-08 14:50:41 +08:00
Nicolas Gramlich	40f1ffe5fb	CCMenuItem(Image): Added possibility to init without any image. (Changes according to: 5e8518eaed78a6c589bf73dadf85e2056f834f36, 013b4cec0a9250268b131105795e87d37cba4d52)	2012-05-31 17:04:53 -07:00
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00