diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-24 10:47:54 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-24 10:47:54 -0500 |
| commit | 0b066539fe68dc5750900c3452189645c40adb45 (patch) | |
| tree | fd01b6eaf174f7744fd82a28b0b948d301fd4d2b /.gitignore | |
| parent | 78d837789a3741c65c3334934d96a505a522ee43 (diff) | |
DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.
Reverting a merge is sticky: it tells git you never want to see that branch
again. Merging the DRTVWR-546 branch, which contained the revert, into the
glthread branch undid much of the development work on that branch. To restore
it we must revert the revert.
This reverts commit 029b41c0419e975bbb28454538b46dc69ce5d2ba.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions