Merge branch 'master' into python3

Conflicts:
	.gitignore
This commit is contained in:
James Booth
2016-07-24 01:22:29 +01:00
135 changed files with 137 additions and 137 deletions

1
.gitignore vendored
View File

@@ -65,7 +65,6 @@ valgrind.out
.DS_Store
apidocs/c/html/
*.swp
python2/
python3/