Merged from branch rfuchs/3.0 Conflicts: daemon/sdp.c debian/changelog tests/simulator-ng.pl utils/ng-client |
12 years ago | |
|---|---|---|
| .. | ||
| .gitignore | adding .gitignore files | 14 years ago |
| Makefile | kernel module compile fixes for kernels >= 3.10 | 12 years ago |
| xt_MEDIAPROXY.c | Update to upcoming 3.0 release (2.9.9 for now) | 12 years ago |
| xt_MEDIAPROXY.h | Update to upcoming 3.0 release (2.9.9 for now) | 12 years ago |