Commit 696e9781 authored by Florent Robinet's avatar Florent Robinet
Browse files

Merge remote-tracking branch 'upstream/master'

parents f3d4cb46 20602c82
......@@ -15,15 +15,15 @@ src/Oconfig.h
doc/html
doc/latex
# Paper
paper/*.pdf
paper/figures/*.pdf
paper/paper.aux
paper/paper.bbl
paper/paper.blg
paper/paper.log
paper/paper.out
paper/paper.toc
paper/paperNotes.bib
# technote
doc/technote/*.pdf
doc/technote/figures/*.pdf
doc/technote/paper.aux
doc/technote/paper.bbl
doc/technote/paper.blg
doc/technote/paper.log
doc/technote/paper.out
doc/technote/paper.toc
doc/technote/paperNotes.bib
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment