diff .hgtags @ 795:a34ec862371f

merged with dev branch
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 09 May 2016 15:33:11 -0400
parents 04497166d8f0
children 8bcac18c2b55
line wrap: on
line diff
--- a/.hgtags	Tue Nov 03 13:48:56 2015 -0500
+++ b/.hgtags	Mon May 09 15:33:11 2016 -0400
@@ -1,1 +1,2 @@
 ea2a8e8e4e77dbf0374e3ddc935d3a28672e8456 v0.1
+6022350f81736f3881726076987300fb3381cd25 OpenCV 3.1