Merge branch 'master' into master

This commit is contained in:
Raul Garcia
2018-09-25 10:58:51 -07:00
committed by GitHub
328 changed files with 8737 additions and 7968 deletions

4
.gitignore vendored
View File

@@ -12,6 +12,4 @@
/.vs/ql/v15/Browse.VC.opendb
/.vs/ql/v15/Browse.VC.db
/.vs/ProjectSettings.json
/.vs/ql5/v15/Browse.VC.opendb
/.vs/ql5/v15/Browse.VC.db
/.vs/ql5/v15/.suo