Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / compile / slang / 8ccbddda3ac7408ba0ae1edab1d066f0d8ad97bc
commit8ccbddda3ac7408ba0ae1edab1d066f0d8ad97bc[log] [tgz]
authorStephen Hines <srhines@google.com>Wed Mar 21 15:30:23 2012 -0700
committerStephen Hines <srhines@google.com>Wed Mar 21 15:30:23 2012 -0700
treee42ac0bc0b9609843fd371771d47f2d2f2612e17
parent4eb4b38b35855436543d229bc3c83b60d47dbbce [diff]
parent9e7e17b0e8f58d985005a41451ef60209ffd68dc [diff]
resolved conflicts for merge of 9e7e17b0 to master

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