Conflicts: daemon/Makefile daemon/call.c daemon/log.c daemon/main.c kernel-module/xt_RTPENGINE.c |
11 years ago | |
|---|---|---|
| .. | ||
| .gitignore | adding .gitignore files | 14 years ago |
| Makefile | MT#9585 rename kernel module and all related items from MEDIAPROXY to RTPENGINE | 11 years ago |
| rtpengine_config.h | Implemented delay measurement of RTP packets in kernel. | 11 years ago |
| xt_RTPENGINE.c | Merge branch 'dev-fmetz' | 11 years ago |
| xt_RTPENGINE.h | Merge branch 'dev-fmetz' | 11 years ago |