MERGE branch STM 325:449 into trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/ros-pkg@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 01:46:30 +00:00
parent 06eb9a2424
commit c26a61f0c5
42 changed files with 1023 additions and 425 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ INSTALL_DIR = rtabmap
all: installed
SVN_DIR = build/rtabmap-svn
SVN_URL = https://rtabmap.googlecode.com/svn/trunk/rtabmap
SVN_URL = https://rtabmap.googlecode.com/svn/branches/STM/rtabmap
SVN_REVISION = -rHEAD
#SVN_PATCH = opencvVer.patch
include $(shell rospack find mk)/svn_checkout.mk
+2 -1
View File
@@ -18,10 +18,11 @@
<depend package="cv_bridge"/>
<depend package="sensor_msgs"/>
<depend package="std_srvs"/>
<depend package="opencv2"/>
<depend package="utilite"/>
<rosdep name="sqlite3"/>
<rosdep name="fftw3"/>
<rosdep name="opencv2.3"/>
</package>