gcontini
2020-10-10 19ee9f50a7d14f48ca993b7c8b21ef4ca3642809
Merge branch 'feature/vs2019_github_actions' of
https://github.com/open-license-manager/open-license-manager into
feature/vs2019_github_actions

# Conflicts:
# .travis.yml
# README.md
# doc/development/Build-the-library-windows.rst
3个文件已修改
10 ■■■■■ 已修改文件
.travis.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
README.md 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
doc/development/Build-the-library-windows.rst 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.travis.yml
@@ -209,7 +209,11 @@
               echo "Boost already installed"
           else
               echo "Boost not cached, compiling it"
<<<<<<< HEAD
               wget -q https://versaweb.dl.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.7z
=======
               wget -q https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.7z
>>>>>>> b399ec224144d77d828d877e501331905cf97a70
               echo "Boost downloaded"
               travis_wait 20 7z x boost_1_68_0.7z -oC:/local
               cd "C:/local/boost_1_68_0"
README.md
@@ -17,9 +17,14 @@
A comprehensive [list of features](http://open-license-manager.github.io/open-license-manager/analysis/features.html), and their status is available in the project site. 
<<<<<<< HEAD
If you're experiencing problems, or you just need informations you can't find in the [documentation](http://open-license-manager.github.io/open-license-manager)  please contact us on the [user forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google), we'll be happy to help. 
Remember to show your appreciation giving us a <a class="github-button" href="https://github.com/open-license-manager/open-license-manager" data-icon="octicon-star" aria-label="Star open-license-manager/open-license-manager on GitHub">star</a> here on GitHub.
=======
If you plan to use this library or part of it remember to show us your appreciation giving it a
<a class="github-button" href="https://github.com/open-license-manager/open-license-manager" data-icon="octicon-star" aria-label="Star open-license-manager/open-license-manager on GitHub">star</a> here on GitHub.
>>>>>>> b399ec224144d77d828d877e501331905cf97a70
## License
The project is donated to the community. It comes with a very large freedom of use for everyone, and it will always be. 
doc/development/Build-the-library-windows.rst
@@ -139,4 +139,3 @@