| commit | 67461be16f7d7e7052b859a7aa6dc20f3a7417bd | [log] [tgz] |
|---|---|---|
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | Sat Sep 15 18:15:16 2012 -0400 |
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | Sat Sep 15 18:15:16 2012 -0400 |
| tree | aa4a36168a7f789c82d4eeb780bbab4e513a8eba | |
| parent | 454d3d595923306503fdcf083258f9558742d30d [diff] | |
| parent | 02c653fa0c60e348f5a09f82f66935c5bc470583 [diff] |
Merge branch 'exp_analysis7' into master Conflicts: celt/celt.c celt/mdct.c include/opus_defines.h