diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-25 11:43:10 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-25 11:43:10 +0200 |
| commit | 10ac081b3c4ebb9b29b81b30f5efe6622f4212bc (patch) | |
| tree | fedfe7efc494145d0b46e91ba5a94c47cb0c1b6f /ftnoir_tracker_aruco/include/board.h | |
| parent | 6baa8ca1070612e5d7cbae7aa62cbe4a9e51ad40 (diff) | |
| parent | 24538cf3a3a91481851618791b11be81437563e4 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_aruco/include/board.h')
| -rw-r--r-- | ftnoir_tracker_aruco/include/board.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ftnoir_tracker_aruco/include/board.h b/ftnoir_tracker_aruco/include/board.h index c1d79292..ec7dd43f 100644 --- a/ftnoir_tracker_aruco/include/board.h +++ b/ftnoir_tracker_aruco/include/board.h @@ -32,8 +32,8 @@ or implied, of Rafael Muñoz Salinas. #include <vector> #include "exports.h" #include "marker.h" -using namespace std; namespace aruco { +using namespace std; /** * 3d representation of a marker */ |