admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 08:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'project/Flat_UI' of https://github.com/secondlife/viewer

Browse Source 
# Conflicts:
#	autobuild.xml
This commit is contained in:
Ansariel
2026-03-09 13:49:45 +01:00
parent 52896959cb 1b9c85dc2d
commit 5af56f2fd5
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autobuild.xml
+11 -11
View File
@@ -2749,16 +2749,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map>
<key>google-fonts</key>
<map>
<key>copyright</key>
<string>Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)</string>
<key>description</key>
<string>Google fonts</string>
<key>license</key>
<string>SIL Open Font License, Version 1.1</string>
<key>license_file</key>
<string>LICENSES/google_inter.txt</string>
<key>name</key>
<string>google-fonts</string>
<key>platforms</key>
<map>
<key>common</key>
@@ -2776,8 +2766,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>common</string>
</map>
</map>
<key>license</key>
<string>SIL Open Font License, Version 1.1</string>
<key>license_file</key>
<string>LICENSES/google_inter.txt</string>
<key>copyright</key>
<string>Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)</string>
<key>version</key>
<string>1.0.0.11083103671</string>
<string>1.0.0.22606339007</string>
<key>name</key>
<string>google-fonts</string>
<key>description</key>
<string>Google fonts</string>
</map>
<key>viewer-manager</key>
<map>