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

This commit is contained in:
Brian West committed 2015-02-17 10:23:44 -06:00
commit ac17d86d92
24 files changed
+220 -88

No files matched your search

+1 -1
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'