|
From: <ge...@us...> - 2008-03-29 00:54:25
|
Revision: 69
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=69&view=rev
Author: gerkey
Date: 2008-03-28 17:54:31 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
reverted accidental commits
Modified Paths:
--------------
pkg/trunk/axis_cam/manifest.xml
pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp
Modified: pkg/trunk/axis_cam/manifest.xml
===================================================================
--- pkg/trunk/axis_cam/manifest.xml 2008-03-29 00:51:03 UTC (rev 68)
+++ pkg/trunk/axis_cam/manifest.xml 2008-03-29 00:54:31 UTC (rev 69)
@@ -12,8 +12,7 @@
<license>BSD</license>
<url>http://stair.stanford.edu</url>
<depend package="common_flows"/>
-<depend package="roscpp"/>
-<!-- <depend package="image_viewer"/> -->
+<depend package="image_viewer"/>
<depend package="string_utils"/>
</package>
Modified: pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp
===================================================================
--- pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp 2008-03-29 00:51:03 UTC (rev 68)
+++ pkg/trunk/axis_cam/src/axis_cam_polled/axis_cam_polled.cpp 2008-03-29 00:54:31 UTC (rev 69)
@@ -28,7 +28,8 @@
// POSSIBILITY OF SUCH DAMAGE.
#include "ros/ros_slave.h"
-#include "common_flows/FlowImage.h"
+#include "SDL/SDL.h"
+#include "image_flows/FlowImage.h"
#include "common_flows/FlowEmpty.h"
#include "axis_cam/axis_cam.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|