| commit | 0e348766c7d819ec2bbd791797d4b0e0c3b8069e | [log] [tgz] |
|---|---|---|
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | Tue Sep 06 11:18:33 2016 +0800 |
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | Tue Sep 06 11:18:33 2016 +0800 |
| tree | 5d4df7935919fc4cce410d970dfe108cdf79e320 | |
| parent | c3bb2e308704073ef832c1d68846caab25ffc988 [diff] | |
| parent | 614fb93a6d0246d5592333a1b914ce71a409fcf7 [diff] |
Merge remote-tracking branch 'mesa/12.0' into marshmallow-x86 Conflicts: src/egl/drivers/dri2/platform_android.c src/mesa/drivers/dri/i965/intel_syncobj.c