| commit | f698db485c76c7ed1a2ad74e5edcc3943eb50feb | |
| author | Mark Seaborn <mrs@mythic-beasts.com> | |
| Sun, 26 Apr 2009 20:28:04 +0000 (26 21:28 +0100) | ||
| committer | Mark Seaborn <mrs@mythic-beasts.com> | |
| Sun, 26 Apr 2009 20:28:04 +0000 (26 21:28 +0100) | ||
| tree | 72f17e235191e2e956560ddb4778fd3f96748693 | treesnapshot (tar.gz zip) |
| parent | cc2976f8173b40e8e7e49d03e9438642bae108b5 | commitdiff |
| parent | 21d343ee79484aa9d1b0d7dadd0f0fbd5202f931 | commitdiff |
Merge branch 'upstream'
Conflicts:
ncv/SConscript
ncv/ncvalidate.c
service_runtime/SConscript
service_runtime/nacl_app.c
service_runtime/nacl_syscall_common.c
service_runtime/sel_addrspace.c
service_runtime/sel_ldr.c
service_runtime/sel_ldr.h
service_runtime/sel_ldr_standard.c
service_runtime/sel_load_image.c
service_runtime/sel_main.c
service_runtime/sel_validate_image.c
Removed generated files: scons-out and *.pyc files
Conflicts:
ncv/SConscript
ncv/ncvalidate.c
service_runtime/SConscript
service_runtime/nacl_app.c
service_runtime/nacl_syscall_common.c
service_runtime/sel_addrspace.c
service_runtime/sel_ldr.c
service_runtime/sel_ldr.h
service_runtime/sel_ldr_standard.c
service_runtime/sel_load_image.c
service_runtime/sel_main.c
service_runtime/sel_validate_image.c
Removed generated files: scons-out and *.pyc files
13 files changed: