# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1398956921 14400
# Node ID b96ff16b1c81e570d5069e12f3d52e95e233bfa5
# Parent  82c06ad62254bfca51dab5ba5c4cc901ffcae715# Parent  41a72146685e856507ee10e0719b8215deea54ca
merged

diff -r 82c06ad62254 -r b96ff16b1c81 c/feature-based-tracking.cpp
--- a/c/feature-based-tracking.cpp	Thu May 01 11:08:26 2014 -0400
+++ b/c/feature-based-tracking.cpp	Thu May 01 11:08:41 2014 -0400
@@ -2,6 +2,8 @@
 #include "Parameters.hpp"
 #include "cvutils.hpp"
 #include "utils.hpp"
+#include "InputVideoFileModule.h"
+#include "InputFrameListModule.h"
 
 #include "src/Trajectory.h"
 #include "src/TrajectoryDBAccessList.h"
@@ -18,9 +20,6 @@
 #include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 
-#include "InputVideoFileModule.h"
-#include "InputFrameListModule.h"
-
 #include <iostream>
 #include <vector>
 #include <ctime>