diff --git a/gui/default/syncthing/core/aboutModalView.html b/gui/default/syncthing/core/aboutModalView.html index 39c88c144..2195e4e70 100644 --- a/gui/default/syncthing/core/aboutModalView.html +++ b/gui/default/syncthing/core/aboutModalView.html @@ -19,22 +19,23 @@ Jakob Borg, Audrius Butkevicius, Alexander Graf, Anderson Mesquita, Antony Male,

Syncthing includes the following software or portions thereof:

diff --git a/vendor/github.com/chmduquesne/rollinghash/LICENSE.txt b/vendor/github.com/chmduquesne/rollinghash/LICENSE.txt new file mode 100644 index 000000000..77305818f --- /dev/null +++ b/vendor/github.com/chmduquesne/rollinghash/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright 2015 Christophe-Marie Duquesne + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/vendor/manifest b/vendor/manifest index 7156200c9..fcb7f884b 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -46,9 +46,10 @@ }, { "importpath": "github.com/chmduquesne/rollinghash", - "repository": "https://github.com/kastelo/rollinghash", + "repository": "https://github.com/chmduquesne/rollinghash", "vcs": "git", - "branch": "reducealloc", + "revision": "53c059e6c7a76f270f603d2ce1971ea165615d1d", + "branch": "master", "notests": true }, { @@ -421,4 +422,4 @@ "notests": true } ] -} +} \ No newline at end of file