diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/llcommon/function_types.h | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/llcommon/function_types.h')
| -rw-r--r-- | indra/llcommon/function_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/function_types.h b/indra/llcommon/function_types.h index 3f42f6d640..7e15895a7e 100644 --- a/indra/llcommon/function_types.h +++ b/indra/llcommon/function_types.h @@ -4,7 +4,7 @@ * @date 2023-01-20 * @brief Extend boost::function_types to examine boost::function and * std::function - * + * * $LicenseInfo:firstyear=2023&license=viewerlgpl$ * Copyright (c) 2023, Linden Research, Inc. * $/LicenseInfo$ |