]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4aaeed ded0300)
Merge pull request #181 in FS/freeswitch from ~CXREG/freeswitch-memcache-file:base_al...
authorMike Jerris <mike@jerris.com>
Fri, 20 Feb 2015 17:23:09 +0000 (11:23 -0600)
committerMike Jerris <mike@jerris.com>
Fri, 20 Feb 2015 17:23:09 +0000 (11:23 -0600)
* commit 'ded03004a21a317783b06c6141430007641af7c6':
  FS-7284 allow -base to satisfy "You must specify all or none of -conf, -log, and -db"

1  2 
src/switch.c patch | diff1 | diff2 | blob | history

diff --cc src/switch.c
Simple merge
Mirror of https://github.com/signalwire/freeswitch.git