6 Commits

Author	SHA1	Message	Date
Marina Kolpakova	b28b2428f6	changing package layout after 'make install' for Android build	2012-06-28 17:23:50 +00:00
Marina Kolpakova	01570fa800	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
Marina Kolpakova	680a44189c	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00
Andrey Kamaev	f666bd221f	Merged the trunk r8595:8668 (except iOS and new gpu functionality)	2012-06-15 13:21:26 +00:00
Andrey Kamaev	50c2443691	Merged Android samples from trunk r8423 r8533	2012-06-01 08:45:45 +00:00
Andrey Kamaev	949c4edf41	Merged the trunk r8408:8457 (inclusive)	2012-05-30 08:47:34 +00:00