diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:54:23 +0200 |
| commit | d6480e2b7f38facd27bf90376aca1c2b3832fa55 (patch) | |
| tree | bd8bd223515cd4ecf74d1efca404af793825f2f2 /indra/newview/CMakeLists.txt | |
| parent | 11a9332fa7bd830d8e44f15a91e008f3a6f9c19d (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a69e4e629d..e47a04a1f9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -234,7 +234,7 @@ set(viewer_SOURCE_FILES llfloaterconversationpreview.cpp llfloaterdeleteprefpreset.cpp llfloaterdestinations.cpp - llfloaterdisplayname.cpp + llfloaterdisplayname.cpp llfloatereditextdaycycle.cpp llfloaterenvironmentadjust.cpp llfloaterevent.cpp @@ -866,7 +866,7 @@ set(viewer_HEADER_FILES llfloaterconversationpreview.h llfloaterdeleteprefpreset.h llfloaterdestinations.h - llfloaterdisplayname.h + llfloaterdisplayname.h llfloatereditextdaycycle.h llfloaterenvironmentadjust.h llfloaterevent.h @@ -2149,7 +2149,7 @@ if (DARWIN) set(MACOSX_BUNDLE_BUNDLE_NAME "SecondLife") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}") set(MACOSX_BUNDLE_BUNDLE_VERSION "${VIEWER_SHORT_VERSION}${VIEWER_MACOSX_PHASE}${VIEWER_REVISION}") - set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Linden Research, Inc. 2019") + set(MACOSX_BUNDLE_COPYRIGHT "Copyright © Linden Research, Inc. 2020") set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "SecondLife.nib") set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "LLApplication") |