[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase2 r306087 - in /team/dvossel/fixthew...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Feb  3 12:42:38 2011
New Revision: 306087

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306087
Log:
svn merge conflict fix

Modified:
    team/dvossel/fixtheworld_phase2/   (props changed)
    team/dvossel/fixtheworld_phase2/main/format.c

Propchange: team/dvossel/fixtheworld_phase2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  3 12:42:38 2011
@@ -1,1 +1,1 @@
-/trunk:1-306054
+/trunk:1-306086

Modified: team/dvossel/fixtheworld_phase2/main/format.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase2/main/format.c?view=diff&rev=306087&r1=306086&r2=306087
==============================================================================
--- team/dvossel/fixtheworld_phase2/main/format.c (original)
+++ team/dvossel/fixtheworld_phase2/main/format.c Thu Feb  3 12:42:38 2011
@@ -639,7 +639,7 @@
 		ast_cli(a->fd, "Disclaimer: this command is for informational purposes only.\n"
 				"\tIt does not indicate anything about your configuration.\n");
 
-	ast_cli(a->fd, "%19s %8s %8s %s\n","ID","TYPE","NAME","DESCRIPTION");
+	ast_cli(a->fd, "%8s %5s %8s %s\n","ID","TYPE","NAME","DESCRIPTION");
 	ast_cli(a->fd, "-----------------------------------------------------------------------------------\n");
 
 	for (x = 0; x < f_len; x++) {
@@ -665,7 +665,7 @@
 			}
 		}
 
-		ast_cli(a->fd, "%19u %5s %8s (%s)\n",
+		ast_cli(a->fd, "%8u %5s %8s (%s)\n",
 			f_list[x].format.id,
 			(AST_FORMAT_GET_TYPE(f_list[x].format.id) == AST_FORMAT_TYPE_AUDIO) ? "audio" :
 			(AST_FORMAT_GET_TYPE(f_list[x].format.id)  == AST_FORMAT_TYPE_IMAGE)  ? "image" :