[asterisk-commits] russell: branch russell/jack r95468 - in /team/russell/jack: ./ apps/

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Dec 31 13:40:57 2007
New Revision: 95468

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95468
Log:
resolve conflict

Modified:
    team/russell/jack/   (props changed)
    team/russell/jack/apps/app_meetme.c

Propchange: team/russell/jack/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/jack/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 31 13:40:57 2007
@@ -1,1 +1,1 @@
-/trunk:1-95433
+/trunk:1-95467

Modified: team/russell/jack/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/jack/apps/app_meetme.c?view=diff&rev=95468&r1=95467&r2=95468
==============================================================================
--- team/russell/jack/apps/app_meetme.c (original)
+++ team/russell/jack/apps/app_meetme.c Mon Dec 31 13:40:57 2007
@@ -2696,7 +2696,7 @@
 		char useropts[32] = "";
 		char adminopts[32] = "";
 		struct ast_tm tm, etm;
-		struct timeval starttime = { 0, }, endtime = { 0, };
+		struct timeval starttime = { .tv_sec=0 }, endtime = { .tv_sec=0 };
 
 		if (rt_schedule) {
 			now = ast_tvnow();