Merge branch 'master' into P25

This commit is contained in:
Jonathan Naylor 2016-09-27 19:47:07 +01:00
commit 25cfff3ada
26 changed files with 43736 additions and 42672 deletions

View file

@ -73,6 +73,16 @@ TXHang=4
#DstIdBlackListSlot2NET=
#DstIdWhiteListSlot1NET=
#DstIdWhiteListSlot2NET=
TGRewriteSlot1=0
TGRewriteSlot2=0
BMAutoRewrite=0
BMRewriteReflectorVoicePrompts=0
DirectDial=0
TargetTG=9
#RewriteMapSlot1=
#RewritemapSlot2=
[System Fusion]
Enable=1