diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-03 00:16:35 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-03 00:18:26 +0300 |
commit | b18f328c08a0af7032c24843cf1d045eea73ad33 (patch) | |
tree | 9db8549ad49b40bc100199bc7a0004ab1a7ce235 /debian/control | |
parent | b12dd38c57fd9b047382e6e2d80b26f36888eb39 (diff) | |
parent | f949415ad6d83c7c7cab282b45b1a639196b2090 (diff) |
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/debian/control b/debian/control deleted file mode 100644 index 50b9ed9a26..0000000000 --- a/debian/control +++ /dev/null @@ -1,16 +0,0 @@ -Source: secondlife-viewer -Section: unknown -Priority: extra -Maintainer: Don Linden <don@lindenlab.com> -Build-Depends: debhelper (>= 5) -Homepage: http://secondlife.com -Standards-Version: 3.7.2 - -Package: secondlife-viewer -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - ia32-libs, - ia32-libs-gtk -Description: Second Life Viewer - Second Life is an online virtual world developed by Linden Lab. - |