The merge is done
Showing
- AUTHORS 10 additions, 0 deletionsAUTHORS
- CHANGES 8 additions, 2 deletionsCHANGES
- ChangeLog 18 additions, 2 deletionsChangeLog
- README 15 additions, 8 deletionsREADME
- README.cvs 10 additions, 0 deletionsREADME.cvs
- TODO 18 additions, 5 deletionsTODO
- config.h.in 0 additions, 9 deletionsconfig.h.in
- configure.ac 20 additions, 50 deletionsconfigure.ac
- sflphone.spec.in 0 additions, 0 deletionssflphone.spec.in
- src/Makefile.am 2 additions, 4 deletionssrc/Makefile.am
- src/audio/Makefile.am 5 additions, 8 deletionssrc/audio/Makefile.am
- src/audio/audiobuffer.cpp 0 additions, 60 deletionssrc/audio/audiobuffer.cpp
- src/audio/audiobuffer.h 0 additions, 73 deletionssrc/audio/audiobuffer.h
- src/audio/audiocodec.cpp 1 addition, 28 deletionssrc/audio/audiocodec.cpp
- src/audio/audiocodec.h 0 additions, 2 deletionssrc/audio/audiocodec.h
- src/audio/audiodrivers.cpp 0 additions, 35 deletionssrc/audio/audiodrivers.cpp
- src/audio/audiodrivers.h 0 additions, 56 deletionssrc/audio/audiodrivers.h
- src/audio/audiodriversalsa.cpp 0 additions, 243 deletionssrc/audio/audiodriversalsa.cpp
- src/audio/audiodriversalsa.h 0 additions, 64 deletionssrc/audio/audiodriversalsa.h
- src/audio/audiodriversoss.cpp 0 additions, 274 deletionssrc/audio/audiodriversoss.cpp
Loading
Please register or sign in to comment