diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-01 18:35:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-04 21:58:53 +0800 |
| commit | 00bb3bb6f07660bd914d29a1389342bb3060d254 (patch) | |
| tree | 431f574922494d2201718f13085f17bc6bd7fb42 /indra/newview/res | |
| parent | a8636720129952c10cf49ab80da21bf8b340b96c (diff) | |
| parent | 4ef9f8f14b35ed388c294d53767a0dca0e890924 (diff) | |
Merge remote-tracking branch 'secondlife/release/26.4' into 26.4
Diffstat (limited to 'indra/newview/res')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/res/have_artwork_bundle.marker | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/res/viewerRes.rc | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/res/have_artwork_bundle.marker b/indra/newview/res/have_artwork_bundle.marker index 1dbb238d53..1dbb238d53 100755..100644 --- a/indra/newview/res/have_artwork_bundle.marker +++ b/indra/newview/res/have_artwork_bundle.marker diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index b88390d78c..b88390d78c 100755..100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc |