diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-09 11:42:36 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-09 11:42:36 +0100 |
commit | 7214f2c1e9c3a0f4fbebe39376f5a0d646cf8bb7 (patch) | |
tree | 6fb34cf656bba8580d085158d73fc7b22c6aa077 /.gitignore | |
parent | 88db1c06124623076b5151eeeea0e8fc5b65caff (diff) | |
parent | 3c29cea8759ebc482c88f0816fc27beaaba875c9 (diff) | |
download | fdk-aac-7214f2c1e9c3a0f4fbebe39376f5a0d646cf8bb7.tar.gz fdk-aac-7214f2c1e9c3a0f4fbebe39376f5a0d646cf8bb7.tar.bz2 fdk-aac-7214f2c1e9c3a0f4fbebe39376f5a0d646cf8bb7.zip |
Merge branch 'master' into alsa
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -14,6 +14,7 @@ config.guess config.log config.status config.sub +compile depcomp install-sh libtool @@ -26,3 +27,8 @@ m4/lt~obsolete.m4 missing stamp-h1 aac-enc +mot-encoder +aac-enc-dabplus +aac-enc-dabplus-zmq +dabplus-zmq +alsa-dabplus-zmq |