diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-11-11 01:55:26 +0200 |
| commit | 32df877cd73b5b6a3672d0159c982077a4b67a9d (patch) | |
| tree | 3db2802f0ab39f2d7b1264e2ac1d3599f1a3bd5a /indra/llui/llui.h | |
| parent | eccc9057d9d9799d3d5056bdfe255bd9e5e2be6a (diff) | |
| parent | e028ae4f023420bedd4e4106f4749e700a14c3cc (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 051ecc4405..b2dcb6dc88 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -31,8 +31,6 @@ #include "llrect.h" #include "llcoord.h" #include "llcontrol.h" -#include "llcoord.h" -#include "llcontrol.h" #include "llinitparam.h" #include "llregistry.h" #include "llrender2dutils.h" |