Merge branch 'master' into 201405amv
This commit is contained in:
commit
cfdcd9ed56
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,4 @@
|
||||
*.aux
|
||||
*.toc
|
||||
*.log
|
||||
|
||||
.DS_Store
|
||||
|
Loading…
Reference in New Issue
Block a user