Merge branch 'master' into python3
Conflicts: .gitignore
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -65,7 +65,6 @@ valgrind.out
|
||||
|
||||
.DS_Store
|
||||
apidocs/c/html/
|
||||
|
||||
*.swp
|
||||
python2/
|
||||
python3/
|
||||
|
||||
Reference in New Issue
Block a user