Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Neuroscr macos license formatting (For Dev Branch) #886

Merged
merged 6 commits into from Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions .travis.yml
Expand Up @@ -150,17 +150,9 @@ after_script:
- echo $TRAVIS_COMMIT_RANGE
- echo $TRAVIS_COMMIT_LOG

after_success:
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- if [[ -z $IS_NOTIFICATION ]]; then ./send.sh success $WEBHOOK_URL; fi

after_failure:
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- if [[ ! -z $IS_NOTIFICATION ]]; then ./send.sh failure $WEBHOOK_URL; fi

notifications:
webhooks:
urls: $WEBHOOK_URL
irc:
on_success: change
on_failure: change
Expand Down
20 changes: 5 additions & 15 deletions osx-setup/resources/license.html
@@ -1,23 +1,13 @@
Lokinet is the reference implementation of LLARP (Low Latency Anonymous
Routing Protocol) and is licensed under ZLIB license, however the protocol
specifications are placed into the public domian using the CC0 License.
Lokinet is the reference implementation of LLARP (Low Latency Anonymous Routing Protocol) and is licensed under ZLIB license, however the protocol specifications are placed into the public domian using the CC0 License.

Copyright (c) 2018-2019 The Loki Project
Copyright (c) 2018-2019 Jeff Becker
Windows NT port and portions Copyright (c) 2018-2019 Rick V.

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
2 changes: 1 addition & 1 deletion readme.md
Expand Up @@ -94,7 +94,7 @@ this puts the built packages in `../`
### MacOS

build:
make sure you have cmake and xcode command line tools installed
make sure you have cmake, libuv and xcode command line tools installed

$ git clone https://github.com/loki-project/loki-network
$ cd loki-network
Expand Down