5 Commits

Author	SHA1	Message	Date
bmanGH	5137583fe2	Merge remote-tracking branch 'upstream/develop' into develop	2013-11-03 02:42:05 +08:00
Ricardo Quesada	17af5b6850	Adds flags in GLProgram to prevent sending uneeded uniforms	2013-10-31 17:56:15 -07:00
bmanGH	693257fffe	add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.	2013-10-28 00:58:57 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00