Jack Palevich 28815d24c9 resolved conflicts for merge of 3945e1 to master

2009-06-10 15:09:22 -07:00

..

CustomLocale

Automated import from //branches/donutburger/...@140818,140818

2009-03-24 18:36:43 -07:00

Development

Add new text display attribute for gles version number

2009-06-08 10:02:52 -07:00

Fallback

AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.

2009-04-02 23:31:16 -07:00

FontLab

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

launchperf

Automated import from //branches/donutburger/...@140818,140818

2009-03-24 18:36:43 -07:00

OBJViewer

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

SdkSetup

AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:

2009-04-02 23:41:32 -07:00

SpareParts

AI 143370: am: CL 143220 am: CL 143022 New spare parts feature. Spare parts is only in engineering builds, so I am hoping it is okay to check in -- it's the same as updating sample code etc.

2009-03-27 19:26:11 -07:00

Term

resolved conflicts for merge of 3945e1 to master

2009-06-10 15:09:22 -07:00