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

@@ -22,7 +22,8 @@
#include <QtGui/QDialog>
#include <QtCore/QUrl>
#include "ui_aboutDialog.h"
class Ui_aboutDialog;
namespace rtabmap {
@@ -33,10 +34,10 @@ class AboutDialog : public QDialog
public:
AboutDialog(QWidget * parent = 0);
virtual ~AboutDialog() {}
virtual ~AboutDialog();
private:
Ui_aboutDialog _ui;
Ui_aboutDialog * _ui;
};
}