MERGE branch STM 325:449 into trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 01:46:30 +00:00
parent c4aff5f20a
commit a2eb8bcab6
100 changed files with 76652 additions and 5164 deletions

View File

@@ -16,6 +16,5 @@
<file>images/IntRoLabSmall.png</file>
<file>images/metal_7280826_512.jpg</file>
<file>images/crosshatch_metal_grille_9280154_150.JPG</file>
<file>resources/PreferencesModel.txt</file>
</qresource>
</RCC>