Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Simon 2016-10-18 08:06:55 +01:00
commit eb3fe2d7fe

View file

@ -124,8 +124,8 @@ Debug=0
[P25 Network] [P25 Network]
Enable=1 Enable=1
GatewayAddress=127.0.0.1 GatewayAddress=127.0.0.1
GatewayPort=20012 GatewayPort=42020
LocalPort=20013 LocalPort=32010
Debug=0 Debug=0
[TFT Serial] [TFT Serial]