Merge branch 'master' of ssh://freeswitch.org:7999/fs/freeswitch

This commit is contained in:
Brian West
2015-02-17 10:23:44 -06:00
24 changed files with 220 additions and 88 deletions

View File

@@ -73,7 +73,7 @@ alias emcas='emacs'
alias meacs='emacs'
alias mecas='emacs'
alias bgit='git commit --author "Brian West <brian@freeswitch.org>"'
alias mgit='git commit --author "Mike Jerris <mike@freeswitch.org>"'
alias mgit='git commit --author "Mike Jerris <mike@jerris.com>"'
alias tgit='git commit --author "Anthony Minessale <anthm@freeswitch.org>"'
alias dp='emacs /usr/local/freeswitch/conf/dialplan/default.xml'
alias go='/usr/local/freeswitch/bin/freeswitch -nonat'