Merge commit '3cd612d44789948f72b52944474e0870c5c60964'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Dec 2013 20:17:55 +0000 (21:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Dec 2013 20:18:11 +0000 (21:18 +0100)
* commit '3cd612d44789948f72b52944474e0870c5c60964':
  gitignore: Ignore multilibrary example programs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
.gitignore

diff --cc .gitignore
  *.ver
  *-example
  *-test
 +*_g
  /.config
  /.version
 -/avconv
 -/avplay
 -/avprobe
 -/avserver
 +/ffmpeg
 +/ffplay
 +/ffprobe
 +/ffserver
  /config.*
  /coverage.info
 -/version.h
  /doc/*.1
 +/doc/*.3
  /doc/*.html
  /doc/*.pod
 +/doc/config.texi
  /doc/avoptions_codec.texi
  /doc/avoptions_format.texi
 +/doc/examples/decoding_encoding
 +/doc/examples/demuxing_decoding
 +/doc/examples/filtering_audio
 +/doc/examples/filtering_video
 +/doc/examples/metadata
 +/doc/examples/muxing
 +/doc/examples/pc-uninstalled
 +/doc/examples/resampling_audio
 +/doc/examples/scaling_video
 +/doc/examples/transcode_aac
 +/doc/fate.txt
  /doc/doxy/html/
+ /doc/examples/output
+ /doc/examples/transcode_aac
  /doc/print_options
  /lcov/
  /libavcodec/*_tablegen