diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-21 16:18:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-05-21 16:18:48 -0400 |
| commit | a04a706c1bf145505afd2da8d149ba909b56045f (patch) | |
| tree | 574c526e1cf87bd840157151649d82eb689f2c5b /indra/llaudio/llvorbisencode.cpp | |
| parent | 0f6a4a3389cdce6d5bb92cd6f4861a46def284cc (diff) | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
merge
Diffstat (limited to 'indra/llaudio/llvorbisencode.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llaudio/llvorbisencode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp index 0e0c80a456..dfd5da12b3 100644..100755 --- a/indra/llaudio/llvorbisencode.cpp +++ b/indra/llaudio/llvorbisencode.cpp @@ -35,7 +35,7 @@ #include "llapr.h" //#if LL_DARWIN -// MBW -- XXX -- Getting rid of SecondLifeVorbis for now -- no fmod means no name collisions. +// MBW -- XXX -- Getting rid of SecondLifeVorbis for now #if 0 #include "VorbisFramework.h" |