solving merging conflicts from 3.1.0 to developer

This commit is contained in:
2018-03-14 15:45:35 +01:00
129 changed files with 1120 additions and 8750 deletions

View File

@ -1,13 +0,0 @@
No implementation found for style `graphicx'
No implementation found for style `eucal'
No implementation found for style `amsxtra'
No implementation found for style `upref'
No implementation found for style `layout'
No implementation found for style `calc'
No implementation found for style `framed'
? brace missing for \
Substitution of arg to newlabelxx delayed.
? brace missing for \textit