Merge branch 'master' into P25

This commit is contained in:
Jonathan Naylor
2016-09-10 14:58:41 +01:00
12 changed files with 42684 additions and 41542 deletions

View File

@@ -92,6 +92,7 @@ Debug=0
Enable=1
Address=44.131.4.1
Port=62031
Jitter=300
# Local=3350
Password=PASSWORD
RSSI=0