Jesse Hall 94cdba97ce resolved conflicts for merge of 5477d0e4 to master ... Change-Id: I7ca75a44018a68bf3a7ac1de17a3ef568a48d2ac		2013-07-11 09:40:54 -07:00
..
include	replace eglWaitSyncANDROID by eglWaitSyncKHR	2013-03-28 14:31:09 -07:00
libagl	Add liblog	2013-04-09 21:55:39 -07:00
libs	resolved conflicts for merge of 5477d0e4 to master	2013-07-11 09:40:54 -07:00
specs	Small clarifications to EGL_ANDROID_presentation_time	2013-06-26 07:50:32 -07:00
tests	am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"	2013-05-13 13:05:36 -07:00
tools/glgen	Fix wrapper equals()	2013-06-21 16:22:02 -07:00