Mercurial > hg > webaudioevaluationtool
annotate .gitignore @ 3111:9ac4f490a1d8
Merge branch 'master' into vnext
# Conflicts:
# python/timeline_view_movement.py
# tests/examples/APE_example.xml
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Sat, 14 Jul 2018 15:30:27 +0100 |
| parents | ac6720456322 |
| children |
| rev | line source |
|---|---|
| b@2201 | 1 *.aux |
| b@2201 | 2 *.bbl |
| b@2201 | 3 *.blg |
| b@2201 | 4 *.fdb_latexmk |
| b@2201 | 5 *.fls |
| b@2201 | 6 *.log |
| b@2201 | 7 *.out |
| b@2201 | 8 *.synctex.gz |
| b@2201 | 9 *.toc |
| giuliomoro@2324 | 10 saves/*.xml |
| giuliomoro@2324 | 11 *.DS_STORE |
| giuliomoro@2327 | 12 *.swp |
| giuliomoro@2333 | 13 *.swo |
| n@2995 | 14 saves/ratings/* |
| n@2995 | 15 saves/timelines/* |
| n@2995 | 16 saves/timelines_movement/* |