From: Moises Silva <moy@sangoma.com>
Date: Tue, 5 Oct 2010 02:08:19 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f7ab903bb001c7dc3959e75db7de7fa5cd328b6;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

5f7ab903bb001c7dc3959e75db7de7fa5cd328b6
diff --cc src/switch.c
index ae38ab5fb8,a28baba6f0..7abe1481d1
--- a/src/switch.c
+++ b/src/switch.c
@@@ -464,13 -461,8 +462,8 @@@ int main(int argc, char *argv[]
  			known_opt++;
  		}
  
- 		if (local_argv[x] && !strcmp(local_argv[x], "-bf")) {
- 			bf++;
- 			known_opt++;
- 		}
- 
  		if (local_argv[x] && !strcmp(local_argv[x], "-version")) {
 -			fprintf(stdout, "FreeSWITCH version: %s\n", SWITCH_VERSION_FULL);
 +			fprintf(stdout, "Sangoma Media Gateway Version: %s\n", SWITCH_VERSION_FULL);
  			return 0;
  			known_opt++;
  		}