diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
commit | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (patch) | |
tree | 778bd8bc6f9a557fed93e040ea58c0b73bea0dbb /debian/compat | |
parent | d734105446182b17a91f6590eaa23ac690032817 (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelvolume.h
Diffstat (limited to 'debian/compat')
-rw-r--r-- | debian/compat | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 |