diff options
| author | 2012-02-09 13:48:46 -0800 | |
|---|---|---|
| committer | 2012-02-09 13:48:46 -0800 | |
| commit | 4f21e3a08adefbb5e109e2f844386ed844c1c436 (patch) | |
| tree | 990c48c9750698233e2705880bd16fd0ed5139ec | |
| parent | ec12ae9933e463181338834387caa7c58b330635 (diff) | |
| parent | 20b9c795d4dedaabac335eb5bcd8f7ba32e38af3 (diff) | |
am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
| -rw-r--r-- | docs/html/resources/tutorials/opengl/opengl-es10.jd | 2 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/opengl/opengl-es20.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/resources/tutorials/opengl/opengl-es10.jd b/docs/html/resources/tutorials/opengl/opengl-es10.jd index 35707667e8ac..2b4462059217 100644 --- a/docs/html/resources/tutorials/opengl/opengl-es10.jd +++ b/docs/html/resources/tutorials/opengl/opengl-es10.jd @@ -58,7 +58,7 @@ carefully consider which version of the OpenGL ES API (1.0/1.1 or 2.0) is most a needs. For more information, see <a href="{@docRoot}guide/topics/graphics/opengl.html#choosing-version">Choosing an OpenGL API Version</a>. If you would prefer to use OpenGL ES 2.0, see the <a -href="{@docRoot}resources/tutorials/opengl/opengl-es20.jd">OpenGL ES 2.0 tutorial</a>.</p> +href="{@docRoot}resources/tutorials/opengl/opengl-es20.html">OpenGL ES 2.0 tutorial</a>.</p> <p>Before you start, you should understand how to create a basic Android application. If you do not know how to create an app, follow the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello diff --git a/docs/html/resources/tutorials/opengl/opengl-es20.jd b/docs/html/resources/tutorials/opengl/opengl-es20.jd index 889dd5030f2c..dd23dbf2051c 100644 --- a/docs/html/resources/tutorials/opengl/opengl-es20.jd +++ b/docs/html/resources/tutorials/opengl/opengl-es20.jd @@ -57,7 +57,7 @@ carefully consider which version of the OpenGL ES API (1.0/1.1 or 2.0) is most a needs. For more information, see <a href="{@docRoot}guide/topics/graphics/opengl.html#choosing-version">Choosing an OpenGL API Version</a>. If you would prefer to use OpenGL ES 1.0, see the <a -href="{@docRoot}resources/tutorials/opengl/opengl-es10.jd">OpenGL ES 1.0 tutorial</a>.</p> +href="{@docRoot}resources/tutorials/opengl/opengl-es10.html">OpenGL ES 1.0 tutorial</a>.</p> <p>Before you start, you should understand how to create a basic Android application. If you do not know how to create an app, follow the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello |