diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
| commit | e70fe3a50d43bd5276f80c9f82fcfb2de02109cb (patch) | |
| tree | c35ab61e94d7b93e0e8be63f60c439d3b6a8c4b9 /indra/newview/res-sdl | |
| parent | 15861d8dec096de57b0b51fa55a61a199a0f4337 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.cpp
Diffstat (limited to 'indra/newview/res-sdl')
| -rw-r--r-- | indra/newview/res-sdl/lltoolzoomout.BMP | bin | 2102 -> 630 bytes |
| -rw-r--r-- | indra/newview/res-sdl/sizeall.BMP | bin | 0 -> 630 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/res-sdl/lltoolzoomout.BMP b/indra/newview/res-sdl/lltoolzoomout.BMP Binary files differindex 7f958383ab..5bdf96f80d 100644 --- a/indra/newview/res-sdl/lltoolzoomout.BMP +++ b/indra/newview/res-sdl/lltoolzoomout.BMP diff --git a/indra/newview/res-sdl/sizeall.BMP b/indra/newview/res-sdl/sizeall.BMP Binary files differnew file mode 100644 index 0000000000..03d9bf4654 --- /dev/null +++ b/indra/newview/res-sdl/sizeall.BMP |
