diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-03 12:29:45 +0100 |
| commit | e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d (patch) | |
| tree | f266aab56db899073b21c1edd1d0e00055b9a2cf /native_client_sdk/doc_generated | |
| parent | 67e8dac6e410a019f58fc452b262a184e8e7fd12 (diff) | |
| download | chromium_org-e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d.tar.gz | |
Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
Diffstat (limited to 'native_client_sdk/doc_generated')
| -rw-r--r-- | native_client_sdk/doc_generated/sdk/examples.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/native_client_sdk/doc_generated/sdk/examples.html b/native_client_sdk/doc_generated/sdk/examples.html index 4111fc0039..6fd6100ca8 100644 --- a/native_client_sdk/doc_generated/sdk/examples.html +++ b/native_client_sdk/doc_generated/sdk/examples.html @@ -127,12 +127,9 @@ make[1]: Entering directory `pepper_31/examples/api/core' make[1]: Leaving directory `pepper_31/examples/api/core' make TOOLCHAIN=pnacl make[1]: Entering directory `pepper_31/examples/api/core' - CXX pnacl/Debug/core_pnacl.o - LINK pnacl/Debug/core.bc - FINALIZE pnacl/Debug/core.pexe - TRANSLATE pnacl/Debug/core_x86_32.nexe - TRANSLATE pnacl/Debug/core_x86_64.nexe - TRANSLATE pnacl/Debug/core_arm.nexe + CXX pnacl/Debug/core.o + LINK pnacl/Debug/core_unstripped.bc + FINALIZE pnacl/Debug/core_unstripped.pexe CREATE_NMF pnacl/Debug/core.nmf make[1]: Leaving directory `pepper_31/examples/api/core' make TOOLCHAIN=linux |