Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
alemuntoni committed Oct 28, 2021
2 parents 8132239 + 476d1c2 commit 38c3a41
Show file tree
Hide file tree
Showing 327 changed files with 2,577 additions and 3,449 deletions.
59 changes: 0 additions & 59 deletions .appveyor.yml

This file was deleted.

9 changes: 5 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
## Thank you for sending a Pull Request to the VCGLib!
## Thank you for sending a Pull Request to the VCGLib!

VCGLib is fully owned by CNR, and all the VCGLib contributors that do not work at the VCLab of CNR must first sign the contributor license agreement that you can find at the following link: https://github.com/cnr-isti-vclab/vcglib/blob/devel/docs/ContributorLicenseAgreement.pdf

If you will sign the CLA, then we will be able to merge your pull request after reviewing it.
The validity of the CLA is two years, therefore after signing it your PRs for the next two years can be merged without further actions.
Please send the signed document to muntoni.alessandro@gmail.com and paolo.cignoni@isti.cnr.it .
If you will not sign the CLA, we will review and then apply your changes as soon as possible.

Before opening the PR, please leave the follwing form with a check for your particluar case:
Before opening the PR, please leave the following form with a check for your particular case:

##### Check with `[x]` what is your case:
- [ ] I already signed and sent via email the CLA;
- [ ] I wil sign and send the CLA via email as soon as possible;
- [ ] I don't want to sign the CLA.
- [ ] I will sign and send the CLA via email as soon as possible;
- [ ] I don't want to sign the CLA.
10 changes: 2 additions & 8 deletions .github/workflows/BuildExamplesWindows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Download Jom
run: |
Invoke-WebRequest -Uri "http://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_1_1_3.zip" -OutFile "jom_1_1_3.zip"
New-Item -Name "jom" -ItemType "directory"
Expand-Archive -Path jom_1_1_3.zip -DestinationPath .\jom
echo "$(Get-Location)\jom" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Setup env variables
id: envs
run: |
Expand All @@ -27,5 +21,5 @@ jobs:
run: |
mkdir build
cd build
cmake -G "NMake Makefiles" -DVCG_BUILD_EXAMPLES=ON ..
jom -j4
cmake -GNinja -DVCG_BUILD_EXAMPLES=ON ..
ninja
49 changes: 0 additions & 49 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit 38c3a41

Please sign in to comment.