BUG: 353573

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

The number of entries should be taken from e_shnum, not e_phnum
which is for the program header table. Probably a copy/paste
error from above.

REVIEW: 125808

Ben Wagner authored Oct 12, 2015 and Alex Richardson committed Oct 12, 2015

In a primitive array, defer to the primitive child type for byteOrder, typeName, and creating a value string for the UI. This allows user defined types which are based on primitive types but override these properties to be displayed as the user defined types otherwise would when used stand-alone.

Testing Done:
Built, built the 'test' target (passed tests), installed, ran with a main.js like the following attached file on a valid .ttf file. Observed that with this change the 'cvt ' array entries have the expected endianness, type name, and value string.

REVIEW: 125523

Nested classes inherit the visibility of the outer class, which isn't
really what we want for private classes. So hide them explicitly.

BUG: 351154