[complement-svn] SF.net SVN: complement: [1930] trunk/complement/explore/lib/misc/ut/ opts_test.cc

[<com...@us...>]

Revision: 1930
          http://complement.svn.sourceforge.net/complement/?rev=1930&view=rev
Author:   complement
Date:     2008-06-29 23:40:02 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Merge branch 'master' of /export/hostel/pub/scm/complement

Conflicts:

	complement/explore/include/misc/opts.h
	complement/explore/lib/misc/ChangeLog
	complement/explore/lib/misc/Makefile.inc
	complement/explore/lib/misc/ut/opts_test.cc

Modified Paths:
--------------
    trunk/complement/explore/lib/misc/ut/opts_test.cc

Modified: trunk/complement/explore/lib/misc/ut/opts_test.cc
===================================================================
--- trunk/complement/explore/lib/misc/ut/opts_test.cc	2008-06-30 06:28:32 UTC (rev 1929)
+++ trunk/complement/explore/lib/misc/ut/opts_test.cc	2008-06-30 06:40:02 UTC (rev 1930)
@@ -842,4 +842,3 @@
 
   return EXAM_RESULT;
 }
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.