diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-08-11 21:39:19 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-08-11 21:39:19 -0400 |
| commit | 8cabc33e960ca93fdc1a32c77cf611269d95d51b (patch) | |
| tree | 931fcecac10bf73214efa07cc3d704ba2bd01272 /indra/newview/res | |
| parent | 9b7ab49575b54523128952af6686d17eb6696725 (diff) | |
| parent | d045f9aa32789a35628aced166145c182751acbf (diff) | |
Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop
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 c9ca758555..c9ca758555 100755..100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc |