Donald Alan Morrison 3ee17b1a23 Merge with c9674e85e8. The diff revealed ... there was no actual conflict, so only a dot was added to the comment so git would accept the commit (otherwise "nothing to commit"); and thus the history is preserved.		2012-08-23 22:32:33 -07:00
..
include/kazmath	Cocos2dx for gles2.	2012-08-17 17:45:21 -04:00
src	Merge with c9674e85e8. The diff revealed	2012-08-23 22:32:33 -07:00