aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Niedermayer2013-12-01 21:17:55 +0100
committerMichael Niedermayer2013-12-01 21:18:11 +0100
commitd4268634155d4aaf4c55cffcf6a2d513ec7670ec (patch)
tree4b0d00e4f42b2346339b6f3e3b576283891135ca /.gitignore
parent975110a85ef8e794fdc041455ff41b0ad30bc01e (diff)
parent3cd612d44789948f72b52944474e0870c5c60964 (diff)
Merge commit '3cd612d44789948f72b52944474e0870c5c60964'
* commit '3cd612d44789948f72b52944474e0870c5c60964': gitignore: Ignore multilibrary example programs Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 33c366f49e..5397a35380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,8 @@
/doc/examples/transcode_aac
/doc/fate.txt
/doc/doxy/html/
+/doc/examples/output
+/doc/examples/transcode_aac
/doc/print_options
/lcov/
/libavcodec/*_tablegen