diff options
| author | Adam Powell <adamp@google.com> | 2010-04-23 16:49:54 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-04-23 16:49:54 -0700 |
| commit | 4ad6092674646373feba9ca231783901e4eece7d (patch) | |
| tree | 2316615a836500c1e7b629b83cdef86f5ee3cc23 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e9de49a7528ebe61897502d153f1b1d8bc57969a (diff) | |
| parent | 58ff1ee5b5786b05fed3c307c381233dcc0a1b2b (diff) | |
resolved conflicts for merge of 81cd2e90 to master
Fixed public.xml value padding for kraken/master
Merge commit '81cd2e90' into manualmerge
Conflicts:
api/current.xml
Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions