David Yat Sin 4585dbffbb Fixed conflict from previous merge		2012-07-25 11:27:01 -04:00
..
curl	conf: add config styles: curl, insideout, sbc, softphone	2012-03-24 04:48:34 +00:00
insideout	Rolling back to find out what's breaking build	2012-06-22 11:35:00 -04:00
sbc	don't use Siren or iLBC by default in example configs	2012-05-29 18:41:17 +00:00
softphone	don't use Siren or iLBC by default in example configs	2012-05-29 18:41:17 +00:00
vanilla	Fixed conflict from previous merge	2012-07-25 11:27:01 -04:00
freeswitch.xml	make configs work from in the source tree if needed	2012-03-26 10:48:03 -05:00