[or-cvs] r11414: Undo brokenness from merge conflict. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-09-10 09:50:00 -0400 (Mon, 10 Sep 2007)
New Revision: 11414

Modified:
   tor/trunk/
   tor/trunk/src/or/ntmain.c
   tor/trunk/src/or/or.h
Log:
 r15005 at catbus:  nickm | 2007-09-10 09:49:03 -0400
 Undo brokenness from merge conflict.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15005] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/ntmain.c
===================================================================
--- tor/trunk/src/or/ntmain.c	2007-09-10 13:48:01 UTC (rev 11413)
+++ tor/trunk/src/or/ntmain.c	2007-09-10 13:50:00 UTC (rev 11414)
@@ -762,4 +762,3 @@
   return 0;
 }
 
-

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-09-10 13:48:01 UTC (rev 11413)
+++ tor/trunk/src/or/or.h	2007-09-10 13:50:00 UTC (rev 11414)
@@ -3025,6 +3025,7 @@
 int tor_init(int argc, char **argv);
 #endif
 
+/********************************* ntmain.c ***************************/
 #ifdef MS_WINDOWS
 #define NT_SERVICE
 #endif