From cdffa16cd3c84bcf6f3a6f83ee2232a3b086fbec Mon Sep 17 00:00:00 2001
From: "N.N." <sevyves@users.sourceforge.net>
Date: Sat, 5 Sep 2009 17:14:41 +0000
Subject: cosmetics

svn path=/trunk/externals/pdp_opencv/; revision=12247
---
 TODO | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'TODO')

diff --git a/TODO b/TODO
index 1031b23..5297d4e 100644
--- a/TODO
+++ b/TODO
@@ -154,6 +154,10 @@ simple edge ... http://www.hci.iastate.edu/575x/doku.php?id=code_samples:edge_de
 http://www.cs.iit.edu/~agam/cs512/lect-notes/opencv-intro/opencv-intro.html#SECTION00053000000000000000
 
 ############################# sevy ++
+<<<<<<< .mine
+one day : stereo calibration ( need two cams and a chessboard )
+=======
 hough lines/circles
 camshift ( very greedy )
 one day : stereo calibration ( need two cams and a chessboard )
+>>>>>>> .r12151
-- 
cgit v1.2.1