Google Git
Sign in
fuchsia/integration/ac1082a1d42bf43e9ad82bd5e6b101a5571dc269
commit
ac1082a1d42bf43e9ad82bd5e6b101a5571dc269
[log]
author
Tamir Duberstein <tamird@fuchsia.infra.roller.gmail.com>
Mon Dec 23 21:23:10 2024 -0800
committer
Copybara-Service <copybara-worker@google.com>
Mon Dec 23 21:25:02 2024 -0800
tree
191b8210ec36e377eb75b9e500e3f861956fe03c
parent
2518dd88615831201e44a34c8b9b05be879bec20 [diff]
[roll] Roll third_party/mesa [mesa] Remove conflict marker

This was left in Change-Id: Ifa7af9b210d0e093b4e1c8b35b2624704a9392fc.

Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/1176873
Original-Revision: d285947fda03a889dee17c61726bfdb41c1c30f3
GitOrigin-RevId: a5cf8527449c5b813551e894fa610f59f0bbccae
Change-Id: I44b4a3e037aa19e8abae20073e6b7b812e3ea4cc
1 file changed
tree: 191b8210ec36e377eb75b9e500e3f861956fe03c
  1. ctf/
  2. git-hooks/
  3. infra/
  4. third_party/
  5. cts
  6. firmware
  7. flower
  8. jiri.lock
  9. MILESTONE
  10. minimal
  11. prebuilts
  12. README.md
  13. stem
  14. test_durations
  15. toolchain
README.md

Integration

This repository contains Fuchsia's Global Integration manifest files.

Making changes

All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.

Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance in one of the communication channels documented at get involved.

Obtaining the source

First install Jiri.

Next run:

$ jiri init
$ jiri import minimal https://fuchsia.googlesource.com/integration
$ jiri update

Third party

Third party projects should have their own subdirectory in ./third_party.