diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:16:09 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:16:09 +0300 |
| commit | 5c18921e9ada7799e31b30e16aabc0580e5d5d38 (patch) | |
| tree | 28d8f9c2bed0909c897be5318b31a91a23c835b4 /indra/newview/skins/default/xui/pl/floater_picks.xml | |
| parent | 1f930a7222b66ebf254ccf8cbda965514915fc3f (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_picks.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pl/floater_picks.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/pl/floater_picks.xml b/indra/newview/skins/default/xui/pl/floater_picks.xml deleted file mode 100644 index a329e834db..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_picks.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<floater name="floater_picks" title="Miejsca" /> |