diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-07 10:52:22 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-07 10:52:22 +0100 |
| commit | 6f7bcc52a06a255c6cbd8d683ec13a36be4608ab (patch) | |
| tree | 8ea2206f67014874ee7e7786ea5ccc338d371f76 /libFDK/include | |
| parent | 7284422f3a907724af91de827b2d32220d0d4ba1 (diff) | |
| parent | 58d7fcd0db89cdc62e9362aa6d63c88843f2837d (diff) | |
| download | ODR-AudioEnc-6f7bcc52a06a255c6cbd8d683ec13a36be4608ab.tar.gz ODR-AudioEnc-6f7bcc52a06a255c6cbd8d683ec13a36be4608ab.tar.bz2 ODR-AudioEnc-6f7bcc52a06a255c6cbd8d683ec13a36be4608ab.zip | |
Merge branch 'master' into alsa
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'libFDK/include')
0 files changed, 0 insertions, 0 deletions