Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / compile / slang / fbfd7f5fd97458b6b23437556025ac1d55e98fd4
commitfbfd7f5fd97458b6b23437556025ac1d55e98fd4[log] [tgz]
authorStephen Hines <srhines@google.com>Thu Oct 27 16:09:01 2011 -0700
committerStephen Hines <srhines@google.com>Thu Oct 27 16:09:01 2011 -0700
tree594d4cdf4d88a90ee4f490385ca41e8e01fa3697
parentc86623eb960965b240bc5e929e760f6bbc1be544 [diff]
parentf736d5a12269e7e74740b130cdca98d9839b31e6 [diff]
resolved conflicts for merge of f736d5a1 to ics-mr1

Change-Id: If31e6d49af2571458500f42f8cc2310758dfaa26
tree: 594d4cdf4d88a90ee4f490385ca41e8e01fa3697
  1. BitWriter_2_9/
  2. tests/
  3. Android.mk
  4. llvm-rs-cc.cpp
  5. llvm-rs-link.cpp
  6. MODULE_LICENSE_APACHE2
  7. NOTICE
  8. os_sep.h
  9. README.html
  10. README.rst
  11. RSCCOptions.td
  12. rslib.bc
  13. rslib.ll
  14. rsScriptC_Lib.bc
  15. rsScriptC_Lib.rs
  16. RSSpec.mk
  17. slang-data.c
  18. slang.cpp
  19. slang.h
  20. slang_assert.h
  21. slang_backend.cpp
  22. slang_backend.h
  23. slang_diagnostic_buffer.cpp
  24. slang_diagnostic_buffer.h
  25. slang_pragma_recorder.cpp
  26. slang_pragma_recorder.h
  27. slang_rs.cpp
  28. slang_rs.h
  29. slang_rs_ast_replace.cpp
  30. slang_rs_ast_replace.h
  31. slang_rs_backend.cpp
  32. slang_rs_backend.h
  33. slang_rs_context.cpp
  34. slang_rs_context.h
  35. slang_rs_export_element.cpp
  36. slang_rs_export_element.h
  37. slang_rs_export_foreach.cpp
  38. slang_rs_export_foreach.h
  39. slang_rs_export_func.cpp
  40. slang_rs_export_func.h
  41. slang_rs_export_type.cpp
  42. slang_rs_export_type.h
  43. slang_rs_export_var.cpp
  44. slang_rs_export_var.h
  45. slang_rs_exportable.cpp
  46. slang_rs_exportable.h
  47. slang_rs_metadata.h
  48. slang_rs_metadata_spec.h
  49. slang_rs_metadata_spec_encoder.cpp
  50. slang_rs_object_ref_count.cpp
  51. slang_rs_object_ref_count.h
  52. slang_rs_pragma_handler.cpp
  53. slang_rs_pragma_handler.h
  54. slang_rs_reflect_utils.cpp
  55. slang_rs_reflect_utils.h
  56. slang_rs_reflection.cpp
  57. slang_rs_reflection.h
  58. slang_rs_spec_table.cpp
  59. slang_rs_type_spec.h
  60. slang_utils.cpp
  61. slang_utils.h
  62. slang_version.h
  63. SlangData.mk
  64. slangdata.py