Commit Graph

3 Commits

Author SHA1 Message Date
Nicholas D Steeves 679ed65580
Add additional header to LICENSE.LESSER LICENSE.MPL-2.0 to…
define which files are exceptions to the Syncthing Tray project
LICENSE, which is currently GPL-2+.
2022-05-23 16:29:29 -04:00
Nicholas D Steeves 90fc8bd185
Add copyright attribution to LICENSE.MPL-2.0
Years were established by combining the following:

git log -- assets/logo-256.png
git log -- \
  tray/resources/icons/hicolor/scalable/status/syncthing-default.svg

And upstream Syncthing confirms MPL-2.0 is the correct license for
these files for v1.20.1 here:

  https://github.com/syncthing/syncthing/issues/8347#issuecomment-1127996095
2022-05-18 16:17:31 -04:00
Nicholas D Steeves fd5c59222a
Merge PNG and SVG icon from Syncthing v1.20.1
From https://github.com/syncthing/syncthing.git

git checkout v1.20.1 -- LICENSE assets/logo-256.png \
  assets/logo-only.svg

mv LICENSE LICENSE.MPL-2.0
[resurrect Syncthing Tray LICENSE in magit]

mv assets/logo-256.png \
  tray/resources/icons/hicolor/256x256/apps/syncthingtray.png

cp -a assets/logo-only.svg \
  tray/resources/icons/hicolor/scalable/apps/syncthingtray.svg
[the upstream copy was identical to Syncthing tray's copy]

mv assets/logo-only.svg \
  widgets/resources/icons/hicolor/scalable/app/syncthingtray.svg
2022-05-18 16:10:43 -04:00